dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-09-13 17:57:06 +02:00
parent 6da1228359 97ec6341e8
commit 10472ef83c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Autoload.php
+2
View File
@@ -54,6 +54,8 @@ class Autoload
$this->root_dir = dirname(dirname(__FILE__)).'/'; $this->root_dir = dirname(dirname(__FILE__)).'/';
if (file_exists($this->root_dir.Autoload::INDEX_FILE)) if (file_exists($this->root_dir.Autoload::INDEX_FILE))
$this->index = include($this->root_dir.Autoload::INDEX_FILE); $this->index = include($this->root_dir.Autoload::INDEX_FILE);
else
$this->generateIndex();
} }
/** /**
controllers/admin/AdminManufacturersController.php
+1 -1
View File
@@ -140,7 +140,7 @@ class AdminManufacturersControllerCore extends AdminController
'lastname' => array( 'lastname' => array(
'title' => $this->l('Last name'), 'title' => $this->l('Last name'),
'width' => 100, 'width' => 100,
'filter_key' => 'a!name' 'filter_key' => 'a!lastname'
), ),
'postcode' => array( 'postcode' => array(
'title' => $this->l('Zip Code/Postal Code'), 'title' => $this->l('Zip Code/Postal Code'),