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

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

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-14 17:31:50 +02:00
parent 7e9cdbb163 3eeac7f2bb
commit 7e4329a4dc
330 changed files with 9160 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/Helper.php
+1 -1
View File
@@ -27,7 +27,7 @@
class HelperCore
{
public $currentIndex;
public $table;
public $table = 'configuration';
public $identifier;
public $token;
public $toolbar_btn;
classes/helper/HelperCalendar.php
+1 -1
View File
@@ -26,7 +26,7 @@
class HelperCalendarCore extends Helper
{
const DEFAULT_DATE_FORMAT = 'Y-m-d';
const DEFAULT_DATE_FORMAT = 'dd-mm-yyyy';
private $_actions;
private $_compare_date_from;
classes/helper/HelperForm.php
-2
View File
@@ -37,8 +37,6 @@ class HelperFormCore extends Helper
/** @var array values of form fields */
public $fields_value = array();
public $table = 'configuration';
public $name_controller = '';
/** @var string if not null, a title will be added on that list */
classes/helper/HelperList.php
+2 -2
View File
@@ -453,10 +453,10 @@ class HelperListCore extends Helper
self::$cache_lang['Delete'] = $this->l('Delete', 'Helper');
if (!array_key_exists('DeleteItem', self::$cache_lang))
self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper');
self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', false, false);
if (!array_key_exists('Name', self::$cache_lang))
self::$cache_lang['Name'] = $this->l('Name:', 'Helper');
self::$cache_lang['Name'] = $this->l('Name:', 'Helper', false, false);
if (!is_null($name))
$name = '\n\n'.self::$cache_lang['Name'].' '.$name;