diff --git a/objects/video.php b/objects/video.php index fbc2d3644c71..9a28bc4993c0 100644 --- a/objects/video.php +++ b/objects/video.php @@ -5552,17 +5552,28 @@ public static function deleteGifAndWebp($filename) public static function clearCache($videos_id, $deleteThumbs = false, $clearFirstPageCache = false, $async = true) { global $global; + + $video = new Video("", "", $videos_id); + $filename = $video->getFilename(); + if (empty($filename)) { + _error_log("Video:clearCache filename not found"); + return false; + } + if ($deleteThumbs) { + self::deleteThumbs($filename, true); + } + if($async){ $videos_id = intval($videos_id); $deleteThumbs = !empty($deleteThumbs)?'true':'false'; $clearFirstPageCache = !empty($clearFirstPageCache)?'true':'false'; execAsync("php {$global['systemRootPath']}plugin/Cache/deleteVideo.json.php $videos_id $deleteThumbs $clearFirstPageCache"); }else{ - return self::_clearCache($videos_id, $deleteThumbs, $clearFirstPageCache, false); + return self::_clearCache($videos_id, $clearFirstPageCache, false); } } - public static function _clearCache($videos_id, $deleteThumbs = false, $clearFirstPageCache = false, $schedule=true) + public static function _clearCache($videos_id, $clearFirstPageCache = false, $schedule=true) { //_error_log("Video:clearCache($videos_id)"); $video = new Video("", "", $videos_id); @@ -5571,9 +5582,6 @@ public static function _clearCache($videos_id, $deleteThumbs = false, $clearFirs _error_log("Video:clearCache filename not found"); return false; } - if ($deleteThumbs) { - self::deleteThumbs($filename, true); - } $videoCache = new VideoCacheHandler($filename); $videoCache->deleteCache($clearFirstPageCache, $schedule);