diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index 285f802e1..763b37b52 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -198,6 +198,7 @@ class ManufacturerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`) WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer']. ($active ? ' AND product_shop.`active` = 1 ' : ''). + ' AND p.visibility NOT IN (\'none\')'. ($all_group ? '' : ' AND p.`id_product` IN ( SELECT cp.`id_product` FROM `'._DB_PREFIX_.'category_group` cg diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 6d4c3a023..bfc0077dd 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -456,7 +456,7 @@ class HelperListCore extends Helper ); if ($this->specificConfirmDelete !== false) - $data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : self::$cache_lang['DeleteItem'].$name; + $data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : addcslashes(Tools::htmlentitiesDecodeUTF8(self::$cache_lang['DeleteItem'].$name), '\''); $tpl->assign(array_merge($this->tpl_delete_link_vars, $data)); diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index 1aa4ae22e..096b2e4c9 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -113,6 +113,9 @@ class ManufacturerControllerCore extends FrontController { $data = Manufacturer::getManufacturers(true, $this->context->language->id, true, false, false, false); $nbProducts = count($data); + $this->n = abs((int)(Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE')))); + $this->p = abs((int)(Tools::getValue('p', 1))); + $data = Manufacturer::getManufacturers(true, $this->context->language->id, true, $this->p, $this->n, false); $this->pagination($nbProducts); foreach ($data as &$item) @@ -129,4 +132,4 @@ class ManufacturerControllerCore extends FrontController else $this->context->smarty->assign('nbManufacturers', 0); } -} +} \ No newline at end of file diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php index 5b00d4831..9f7215a5f 100644 --- a/modules/pscleaner/pscleaner.php +++ b/modules/pscleaner/pscleaner.php @@ -372,6 +372,7 @@ class PSCleaner extends Module // @Todo: Remove attachment files, images... Image::clearTmpDir(); + $this->clearAllCaches(); return $logs; } @@ -559,6 +560,9 @@ class PSCleaner extends Module protected function clearAllCaches() { + $index = file_get_contents(_PS_TMP_IMG_DIR_.'index.php'); + Tools::deleteDirectory(_PS_TMP_IMG_DIR_, false); + file_put_contents(_PS_TMP_IMG_DIR_.'index.php', $index); Context::getContext()->smarty->clearAllCache(); } } diff --git a/themes/default/pagination.tpl b/themes/default/pagination.tpl index 070ab7e9b..fa806db11 100644 --- a/themes/default/pagination.tpl +++ b/themes/default/pagination.tpl @@ -53,42 +53,42 @@