Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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'),
|
||||
|
||||
Reference in New Issue
Block a user