Replace references to NOW() in SQL queries with a DateTimeFormat generated parameter

diff --git a/src/Core/Cache/Type/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php
index ef6a30afeb80725eae13ad3acef2c4a7577dd0a3..55282a73e73ead720ad3ac5386cf738e79f38b94 100644 (file)
--- a/src/Core/Cache/Type/DatabaseCache.php
+++ b/src/Core/Cache/Type/DatabaseCache.php
@@ -146,7 +146,7 @@ class DatabaseCache extends AbstractCache implements ICanCache
        {
                try {
                        if ($outdated) {
-                               return $this->dba->delete('cache', ['`expires` < NOW()']);
+                               return $this->dba->delete('cache', ['`expires` < ?', DateTimeFormat::utcNow()]);
                        } else {
                                return $this->dba->delete('cache', ['`k` IS NOT NULL ']);
                        }

diff --git a/src/Worker/ClearCache.php b/src/Worker/ClearCache.php
index 33bf5894752bcd74aa5a9681c4c41d1a8e710150..80dc5ec8c95478db1f8ecc5a612b5fc8ef4d840a 100644 (file)
--- a/src/Worker/ClearCache.php
+++ b/src/Worker/ClearCache.php
@@ -23,6 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * Clear cache entries
@@ -31,15 +32,13 @@ class ClearCache
 {
        public static function execute()
        {
-               $a = DI::app();
-
                // clear old cache
                DI::cache()->clear();
 
                // Delete the cached OEmbed entries that are older than three month
-               DBA::delete('oembed', ["`created` < NOW() - INTERVAL 3 MONTH"]);
+               DBA::delete('oembed', ["`created` < ?", DateTimeFormat::utc('now - 3 months')]);
 
                // Delete the cached "parsed_url" entries that are expired
-               DBA::delete('parsed_url', ["`expires` < NOW()"]);
+               DBA::delete('parsed_url', ["`expires` < ?", DateTimeFormat::utcNow()]);
        }
 }