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

// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-10 12:18:56 +00:00
parent 251dd966b7
commit 577221ff08
280 changed files with 1971 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Configuration.php
+7 -7
View File
@@ -114,7 +114,7 @@ class ConfigurationCore extends ObjectModel
$sql = 'SELECT c.`name`, cl.`id_lang`, IF(cl.`id_lang` IS NULL, c.`value`, cl.`value`) AS value, c.id_group_shop, c.id_shop
FROM `'._DB_PREFIX_.'configuration` c
LEFT JOIN `'._DB_PREFIX_.'configuration_lang` cl ON (c.id_configuration = cl.id_configuration)';
if (!$results = Db::getInstance()->ExecuteS($sql))
if (!$results = Db::getInstance()->executeS($sql))
return;
foreach ($results as $row)
@@ -307,7 +307,7 @@ class ConfigurationCore extends ObjectModel
WHERE c.name = \''.pSQL($key).'\''
.Configuration::sqlRestriction($shopGroupID, $shopID)
.')';
$result &= Db::getInstance()->Execute($sql);
$result &= Db::getInstance()->execute($sql);
}
}
// If key does not exists, create it
@@ -361,11 +361,11 @@ class ConfigurationCore extends ObjectModel
FROM `'._DB_PREFIX_.'configuration`
WHERE `name` = \''.pSQL($key).'\'
)';
$result = Db::getInstance()->Execute($sql);
$result = Db::getInstance()->execute($sql);
$sql = 'DELETE FROM `'._DB_PREFIX_.'configuration`
WHERE `name` = \''.pSQL($key).'\'';
$result2 = Db::getInstance()->Execute($sql);
$result2 = Db::getInstance()->execute($sql);
return ($result && $result2);
}
@@ -383,11 +383,11 @@ class ConfigurationCore extends ObjectModel
$id = Configuration::getIdByName($key, $shopGroupID, $shopID);
$sql = 'DELETE FROM '._DB_PREFIX_.'configuration
WHERE id_configuration = '.$id;
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
$sql = 'DELETE FROM '._DB_PREFIX_.'configuration_lang
WHERE id_configuration = '.$id;
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
}
/**
@@ -495,6 +495,6 @@ class ConfigurationCore extends ObjectModel
'.($sql_sort != '' ? $sql_sort : '').'
'.($sql_limit != '' ? $sql_limit : '').'
';
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query);
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
}
}