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

// Merge -> revision 9352

Browse Source
This commit is contained in:
rMalie
2011-10-14 08:20:54 +00:00
parent 85937793ec
commit d79fcf00fb
332 changed files with 6104 additions and 2643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Language.php
+2 -2
View File
@@ -547,7 +547,7 @@ class LanguageCore extends ObjectModel
public static function getIdByIso($iso_code)
{
if (!Validate::isLanguageIsoCode($iso_code))
die(Tools::displayError('Fatal error : iso code is not correct : ').$iso_code);
die(Tools::displayError('Fatal error: ISO code is not correct').' '.$iso_code);
return Db::getInstance()->getValue('SELECT `id_lang` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\'');
}
@@ -555,7 +555,7 @@ class LanguageCore extends ObjectModel
public static function getLanguageCodeByIso($iso_code)
{
if (!Validate::isLanguageIsoCode($iso_code))
die(Tools::displayError('Fatal error : iso code is not correct : ').$iso_code);
die(Tools::displayError('Fatal error: ISO code is not correct').' '.$iso_code);
return Db::getInstance()->getValue('SELECT `language_code` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\'');
}
classes/PaymentModule.php
+1 -1
View File
@@ -453,7 +453,7 @@ abstract class PaymentModuleCore extends Module
$fileAttachment = NULL;
if (Validate::isEmail($customer->email))
Mail::Send((int)$order->id_lang, 'order_conf', Mail::l('Order confirmation', $order->id_lang), $data, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, $fileAttachment);
Mail::Send((int)$order->id_lang, 'order_conf', Mail::l('Order confirmation', (int)$order->id_lang), $data, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, $fileAttachment);
}
$this->currentOrder = (int)$order->id;
return true;
classes/Tools.php
+2 -2
View File
@@ -1939,7 +1939,7 @@ FileETag INode MTime Size
if (!is_array($apacheModuleList))
$apacheModuleList = apache_get_modules();
// we need strpos (example can be evasive20
// we need strpos (example, evasive can be evasive20)
foreach ($apacheModuleList as $module)
{
if (strpos($module, $name)!==false)
@@ -1955,7 +1955,7 @@ FileETag INode MTime Size
phpinfo(INFO_MODULES);
$phpinfo = ob_get_contents();
ob_end_clean();
if (strpos($phpinfo, $module) !== false)
if (strpos($phpinfo, $name) !== false)
return true;
}
classes/Validate.php
+1 -1
View File
@@ -289,7 +289,7 @@ class ValidateCore
*/
public static function isMessage($message)
{
return preg_match('/^([^<>{}]|<br \/>)*$/i', $message);
return !preg_match('/[<>{}]/i', $message);
}
/**