diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 9c246856b..0c802a493 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -399,7 +399,7 @@ class AdminControllerCore extends Controller const LEVEL_VIEW = 1; /** @var string path for recomendation content */ - const RECOMMENDATION_CONTENT = ''; + const RECOMMENDATION_CONTENT_FILE_PATH = ''; public function __construct() { @@ -3967,9 +3967,9 @@ class AdminControllerCore extends Controller if ($recommendationContent = $this->updateRecommendationContent()) { $content['cache'] = false; } - if (!isset($this->context->cookie->{$this->controller_name.'_closed'}) || !$this->context->cookie->{$this->controller_name.'_closed'}) { - if (file_exists(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath())) { - $content['success'] = true; + if (file_exists(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath())) { + $content['success'] = true; + if (!isset($this->context->cookie->{$this->controller_name.'_closed'}) || !$this->context->cookie->{$this->controller_name.'_closed'}) { $content['html'] = file_get_contents(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath()); } } @@ -3985,10 +3985,11 @@ class AdminControllerCore extends Controller array('controller' => $this->context->controller->controller_name) )) { $recommendationContent = json_decode($recommendationContent, true); - if (isset($this->context->cookie->{$this->context->controller->controller_name.'_key'})) { - if ($this->context->cookie->{$this->context->controller->controller_name.'_key'} != $recommendationContent['key']) { - unset($this->context->cookie->{$this->context->controller->controller_name.'_closed'}); - } + if (!isset($this->context->cookie->{$this->context->controller->controller_name.'_key'})) { + $this->context->cookie->{$this->context->controller->controller_name.'_key'} = ''; + } + if ($this->context->cookie->{$this->context->controller->controller_name.'_key'} != $recommendationContent['key']) { + unset($this->context->cookie->{$this->context->controller->controller_name.'_closed'}); } $this->context->cookie->{$this->context->controller->controller_name.'_key'} = $recommendationContent['key']; if (isset($recommendationContent['success']) && $recommendationContent['success']) { @@ -4018,7 +4019,7 @@ class AdminControllerCore extends Controller public function getRecommendationFilePath() { - return static::RECOMMENDATION_CONTENT; + return static::RECOMMENDATION_CONTENT_FILE_PATH; } /** diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 361b00e07..2c365ef6b 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -27,7 +27,7 @@ class AdminDashboardControllerCore extends AdminController { - const RECOMMENDATION_CONTENT = '/cache/dashboard_recommendation.html'; + const RECOMMENDATION_CONTENT_FILE_PATH = '/cache/dashboard_recommendation.html'; public function __construct() { diff --git a/controllers/admin/AdminModulesCatalogController.php b/controllers/admin/AdminModulesCatalogController.php index f8e498b3f..4bb3defe0 100644 --- a/controllers/admin/AdminModulesCatalogController.php +++ b/controllers/admin/AdminModulesCatalogController.php @@ -23,7 +23,7 @@ class AdminModulesCatalogControllerCore extends AdminController public $modules; - const RECOMMENDATION_CONTENT = '/cache/catalog_recommendation.html'; + const RECOMMENDATION_CONTENT_FILE_PATH = '/cache/catalog_recommendation.html'; const ELEMENT_TYPE_MODULE = 1; const ELEMENT_TYPE_THEME = 2;