diff --git a/classes/Tools.php b/classes/Tools.php index f71f8c4a4..c48c02177 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -3320,9 +3320,9 @@ exit; * @param int $timeout * @return bool */ - public static function isFresh($file, $timeout = _TIME_1_WEEK_) + public static function isFresh($file, $timeout = _TIME_1_WEEK_, $check_size = true) { - if (($time = @filemtime(_PS_ROOT_DIR_.$file)) && filesize(_PS_ROOT_DIR_.$file) > 0) { + if (($time = @filemtime(_PS_ROOT_DIR_.$file)) && ($check_size ? filesize(_PS_ROOT_DIR_.$file) > 0: true)) { return ((time() - $time) < $timeout); } diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 8e90d176d..5f2d57bac 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -496,7 +496,7 @@ class AdminDashboardControllerCore extends AdminController public function getRecommendationContent() { - if (!Tools::isFresh(self::DASHBOARD_RECOMMENDATION_CONTENT, _TIME_1_DAY_)) { + if (!Tools::isFresh(self::DASHBOARD_RECOMMENDATION_CONTENT, _TIME_1_DAY_, false)) { @file_put_contents(_PS_ROOT_DIR_.self::DASHBOARD_RECOMMENDATION_CONTENT, Tools::addonsRequest('dashboard-recommendation')); } if (file_exists(_PS_ROOT_DIR_.self::DASHBOARD_RECOMMENDATION_CONTENT)) { diff --git a/controllers/admin/AdminModulesCatalogController.php b/controllers/admin/AdminModulesCatalogController.php index a53454b62..6b8e7f953 100644 --- a/controllers/admin/AdminModulesCatalogController.php +++ b/controllers/admin/AdminModulesCatalogController.php @@ -242,7 +242,7 @@ class AdminModulesCatalogControllerCore extends AdminController public function getRecommendationContent() { - if (!Tools::isFresh(self::CATALOG_RECOMMENDATION_CONTENT, _TIME_1_DAY_)) { + if (!Tools::isFresh(self::CATALOG_RECOMMENDATION_CONTENT, _TIME_1_DAY_, false)) { @file_put_contents(_PS_ROOT_DIR_.self::CATALOG_RECOMMENDATION_CONTENT, Tools::addonsRequest('catalog-recommendation')); } if (file_exists(_PS_ROOT_DIR_.self::CATALOG_RECOMMENDATION_CONTENT)) { diff --git a/js/admin.js b/js/admin.js index 2ba357032..4d474721a 100644 --- a/js/admin.js +++ b/js/admin.js @@ -1622,12 +1622,17 @@ function loadRecommendation() let images = $('#recommendation-wrapper img'); let loaded = 0; let total = $(images).length; - $(images).on('load', function() { - if (++loaded === total) { - $('#recommendation-wrapper-skeleton').fadeOut('slow').hide(); - $('#recommendation-wrapper').fadeIn(); - } - }); + if (images.length) { + $(images).on('load', function() { + if (++loaded === total) { + $('#recommendation-wrapper-skeleton').fadeOut('slow').hide(); + $('#recommendation-wrapper').fadeIn(); + } + }); + } else { + $('#recommendation-wrapper-skeleton').fadeOut('slow').hide(); + $('#recommendation-wrapper').fadeIn(); + } } }, error: function(res) {