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-04 18:34:51 +01:00
parent bf2d54e286 8aedd4eb04
commit fa68e015b3
444 changed files with 13555 additions and 9035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/Helper.php
+6 -8
View File
@@ -214,20 +214,18 @@ class HelperCore
$html = '
<script type="text/javascript">
var inputName = "'.$input_name.'";
';
var inputName = \''.addcslashes($input_name, '\'').'\';'."\n";
if (count($selected_cat) > 0)
{
if (isset($selected_cat[0]))
$html .= 'var selectedCat = "'.implode(',', $selected_cat).'";';
$html .= ' var selectedCat = '.(int)implode(',', $selected_cat).';'."\n";
else
$html .= 'var selectedCat = "'.implode(',', array_keys($selected_cat)).'";';
$html .= ' var selectedCat = '.(int)implode(',', array_keys($selected_cat)).';'."\n";
}
else
$html .= 'var selectedCat = "";';
$html .= '
var selectedLabel = \''.$translations['selected'].'\';
var home = \''.$root['name'].'\';
$html .= ' var selectedCat = \'\';'."\n";
$html .= ' var selectedLabel = \''.$translations['selected'].'\';
var home = \''.addcslashes($root['name'], '\'').'\';
var use_radio = '.(int)$use_radio.';';
if (!$use_in_popup)
$html .= '
classes/helper/HelperList.php
+6 -5
View File
@@ -455,13 +455,13 @@ 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', false, false);
self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', true, false);
if (!array_key_exists('Name', self::$cache_lang))
self::$cache_lang['Name'] = $this->l('Name:', 'Helper', false, false);
self::$cache_lang['Name'] = $this->l('Name:', 'Helper', true, false);
if (!is_null($name))
$name = '\n\n'.self::$cache_lang['Name'].' '.$name;
$name = addcslashes('\n\n'.self::$cache_lang['Name'].' '.$name, '\'');
$data = array(
$this->identifier => $id,
@@ -470,7 +470,8 @@ class HelperListCore extends Helper
);
if ($this->specificConfirmDelete !== false)
$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(addcslashes(self::$cache_lang['DeleteItem'].$name, '\''));
$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(self::$cache_lang['DeleteItem'].$name);
$tpl->assign(array_merge($this->tpl_delete_link_vars, $data));
return $tpl->fetch();
@@ -523,7 +524,7 @@ class HelperListCore extends Helper
if (Tools::getIsset($this->table.'Orderby'))
$order = '&'.$this->table.'Orderby='.urlencode($this->orderBy).'&'.$this->table.'Orderway='.urlencode(strtolower($this->orderWay));
$action = $this->currentIndex.$identifier.'&token='.$token.$order.'#'.$this->table;
$action = $this->currentIndex.$identifier.'&token='.$token.'#'.$this->table;
/* Determine current page number */
$page = (int)Tools::getValue('submitFilter'.$this->list_id);