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
This commit is contained in:
rMalie
2011-10-10 12:18:56 +00:00
parent 149c814a45
commit 9510337b1d
280 changed files with 1971 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/php/utf8.php
+4 -4
View File
@@ -86,7 +86,7 @@ function latin1_database_to_utf8()
foreach ($tables AS $table)
{
/* Latin1 datas' selection */
if (!Db::getInstance()->Execute('SET NAMES latin1'))
if (!Db::getInstance()->execute('SET NAMES latin1'))
echo 'Cannot change the sql encoding to latin1!';
$query = 'SELECT `'.$table['id'].'`';
foreach ($table['fields'] AS $field)
@@ -94,7 +94,7 @@ function latin1_database_to_utf8()
if (isset($table['lang']) AND $table['lang'])
$query .= ', `id_lang`';
$query .= ' FROM `'._DB_PREFIX_.$table['name'].'`';
$latin1Datas = Db::getInstance()->ExecuteS($query);
$latin1Datas = Db::getInstance()->executeS($query);
if ($latin1Datas === false)
{
$warningExist = true;
@@ -109,7 +109,7 @@ function latin1_database_to_utf8()
if (Db::getInstance()->NumRows())
{
/* Utf-8 datas' restitution */
if (!Db::getInstance()->Execute('SET NAMES utf8'))
if (!Db::getInstance()->execute('SET NAMES utf8'))
echo 'Cannot change the sql encoding to utf8!';
foreach ($latin1Datas AS $latin1Data)
{
@@ -120,7 +120,7 @@ function latin1_database_to_utf8()
$query .= ' WHERE `'.$table['id'].'` = '.(int)($latin1Data[$table['id']]);
if (isset($table['lang']) AND $table['lang'])
$query .= ' AND `id_lang` = '.(int)($latin1Data['id_lang']);
if (!Db::getInstance()->Execute($query))
if (!Db::getInstance()->execute($query))
{
$warningExist = true;
$requests .= '