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

[-] INSTALLER : Fix infinite loop when order message has additional ampersand

Browse Source
This commit is contained in:
gRoussac
2013-09-03 18:36:30 +02:00
parent 6daf8ebbfa
commit b55a84e961
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/update_order_messages.php
+5 -4
View File
@@ -29,17 +29,18 @@ function update_order_messages()
$step = 3000; $step = 3000;
$count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message'); $count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message');
$nb_loop = $start = 0; $nb_loop = $start = 0;
$pattern = '<br|&[a-zA-Z]{1,8};';
if($count_messages > 0) if($count_messages > 0)
$nb_loop = ceil($count_messages / $step); $nb_loop = ceil($count_messages / $step);
for($i = 0; $i < $nb_loop; $i++) for($i = 0; $i < $nb_loop; $i++)
{ {
$sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \'<br|&[^;]{1,8}\' LIMIT '.(int)$start.', '.(int)$step; $sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \''.pSQL($pattern, true).'\' LIMIT '.(int)$start.', '.(int)$step;
if ($messages = Db::getInstance()->query($sql)) if ($messages = Db::getInstance()->query($sql))
while ($message = Db::getInstance()->nextRow($messages)) while ($message = Db::getInstance()->nextRow($messages))
{ {
if(is_array($message)) if(is_array($message))
{ {
$sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' $sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(preg_replace('/'.$pattern.'/', '', Tools::htmlentitiesDecodeUTF8(br2nl($message['message'])))).'\'
WHERE id_message = '.(int)$message['id_message']; WHERE id_message = '.(int)$message['id_message'];
$result = Db::getInstance()->execute($sql); $result = Db::getInstance()->execute($sql);
} }
@@ -50,13 +51,13 @@ function update_order_messages()
$nb_loop = ceil($count_messages / $step); $nb_loop = ceil($count_messages / $step);
for($i = 0; $i < $nb_loop; $i++) for($i = 0; $i < $nb_loop; $i++)
{ {
$sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \'<br|&[^;]{1,8}\' LIMIT '.(int)$start.', '.(int)$step; $sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \''.pSQL($pattern, true).'\' LIMIT '.(int)$start.', '.(int)$step;
if ($messages = Db::getInstance()->query($sql)) if ($messages = Db::getInstance()->query($sql))
while ($message = Db::getInstance()->nextRow($messages)) while ($message = Db::getInstance()->nextRow($messages))
{ {
if(is_array($message)) if(is_array($message))
{ {
$sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' $sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(preg_replace('/'.$pattern.'/', '', Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message'])))).'\'
WHERE id_customer_message = '.(int)$message['id_customer_message']; WHERE id_customer_message = '.(int)$message['id_customer_message'];
Db::getInstance()->execute($sql); Db::getInstance()->execute($sql);
} }