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-11-07 16:48:56 +01:00
parent b51b388eaa 75171c77dd
commit 01d8376ee7
729 changed files with 8289 additions and 30730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperList.php
+5 -3
View File
@@ -64,6 +64,8 @@ class HelperListCore extends Helper
public $position_identifier;
public $table_id;
/**
* @var string Customize list display
*
@@ -536,8 +538,8 @@ class HelperListCore extends Helper
isset($this->context->cookie->{$this->list_id.'_pagination'}) ? $this->context->cookie->{$this->list_id.'_pagination'} : null
);
if ($this->position_identifier && (int)Tools::getValue($this->position_identifier, 1))
$table_id = substr($this->identifier, 3, strlen($this->identifier));
if (!isset($this->table_id) && $this->position_identifier && (int)Tools::getValue($this->position_identifier, 1))
$this->table_id = substr($this->identifier, 3, strlen($this->identifier));
if ($this->position_identifier && ($this->orderBy == 'position' && $this->orderWay != 'DESC'))
$table_dnd = true;
@@ -628,7 +630,7 @@ class HelperListCore extends Helper
'id_cat' => $id_cat,
'shop_link_type' => $this->shopLinkType,
'has_actions' => !empty($this->actions),
'table_id' => isset($table_id) ? $table_id : null,
'table_id' => isset($this->table_id) ? $this->table_id : null,
'table_dnd' => isset($table_dnd) ? $table_dnd : null,
'name' => isset($name) ? $name : null,
'name_id' => isset($name_id) ? $name_id : null,