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

[-] INSTALLER : Errors in upgrader

Browse Source
This commit is contained in:
gRoussac
2013-07-15 22:01:41 +02:00
parent a6d0ef744e
commit e48b2a411e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install-dev/upgrade/php/add_new_tab.php
View File

@@ -24,12 +24,10 @@
* International Registered Trademark & Property of PrestaShop SA
*/
function add_new_tab($className, $name, $id_parent, $returnId = false, $parentTab)
function add_new_tab($className, $name, $id_parent, $returnId = false, $parentTab = null)
{
if (isset($parentTab) && !empty($parentTab) && (is_null($id_parent) || empty($id_parent)))
if (!is_null($parentTab) && !empty($parentTab))
$id_parent = (int)Db::getInstance()->getValue('SELECT `id_tab` FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($parentTab).'\'');
if (!$id_parent)
return false;
$array = array();
foreach (explode('|', $name) AS $item)

3
install-dev/upgrade/sql/1.5.5.0.sql
View File

@@ -22,6 +22,5 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
ALTER TABLE `PREFIX_log` ADD `id_employee` INT(10) UNSIGNED NULL AFTER `object_id`;
@id_parent = (SELECT IFNULL(id_tab, 1) FROM `PREFIX_tab` WHERE `class_name` = 'AdminPriceRule' LIMIT 1);
SET @id_parent = (SELECT IFNULL(id_tab, 1) FROM `PREFIX_tab` WHERE `class_name` = 'AdminPriceRule' LIMIT 1);
UPDATE `PREFIX_tab` SET id_parent = @id_parent WHERE `id_parent` = 1 AND `class_name` = 'AdminMarketing' LIMIT 1;