diff --git a/src/Core/Cache/Type/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php index ef6a30afeb..55282a73e7 100644 --- 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 33bf589475..80dc5ec8c9 100644 --- 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()]); } }