From 5363e75238f955005a76c68ae98045e6cf3a5548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 13 Sep 2013 12:13:12 +0200 Subject: [PATCH 1/2] // small fix --- classes/Autoload.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/Autoload.php b/classes/Autoload.php index 7f20b0cf9..bd1a6715c 100644 --- a/classes/Autoload.php +++ b/classes/Autoload.php @@ -54,6 +54,8 @@ class Autoload $this->root_dir = dirname(dirname(__FILE__)).'/'; if (file_exists($this->root_dir.Autoload::INDEX_FILE)) $this->index = include($this->root_dir.Autoload::INDEX_FILE); + else + $this->generateIndex(); } /** From 97ec6341e858d7b3b5d3938aa59ac9dfdd558ab3 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 13 Sep 2013 15:39:30 +0200 Subject: [PATCH 2/2] [-] BO ; Fix bug #PSCFV-10393 manufacturer filter --- controllers/admin/AdminManufacturersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index ebdb2ad1d..4d26c7627 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -140,7 +140,7 @@ class AdminManufacturersControllerCore extends AdminController 'lastname' => array( 'title' => $this->l('Last name'), 'width' => 100, - 'filter_key' => 'a!name' + 'filter_key' => 'a!lastname' ), 'postcode' => array( 'title' => $this->l('Zip Code/Postal Code'),