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

// Fix replace \\" by " in english keys and change french keys for errors files

Browse Source
This commit is contained in:
lLefevre
2012-03-15 08:31:12 +00:00
parent 18bb023205
commit 4f86c0d0ac
14 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Backup.php
+1 -1
View File
@@ -103,7 +103,7 @@ class BackupCore
$backupdir = realpath(_PS_ADMIN_DIR_.self::$backupDir);
if ($backupdir === false)
die(Tools::displayError('\\"Backup\\" directory does not exist.'));
die(Tools::displayError('"Backup" directory does not exist.'));
// Check the realpath so we can validate the backup file is under the backup directory
if (!empty($filename))
classes/Cart.php
+1 -1
View File
@@ -2318,7 +2318,7 @@ class CartCore extends ObjectModel
$carrier = self::$_carriers[$id_carrier];
if (!Validate::isLoadedObject($carrier))
die(Tools::displayError('Fatal error: \\"no default carrier\\"'));
die(Tools::displayError('Fatal error: "no default carrier"'));
if (!$carrier->active)
return $shipping_cost;
classes/Mail.php
+4 -4
View File
@@ -60,23 +60,23 @@ class MailCore
if (!empty($from) && !Validate::isEmail($from))
{
Tools::dieOrLog(Tools::displayError('Error: parameter \\"from\\" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter "from" is corrupted'), $die);
return false;
}
if (!empty($fromName) && !Validate::isMailName($fromName))
{
Tools::dieOrLog(Tools::displayError('Error: parameter \\"fromName\\" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter "fromName" is corrupted'), $die);
return false;
}
if (!is_array($to) && !Validate::isEmail($to))
{
Tools::dieOrLog(Tools::displayError('Error: parameter \\"to\\" is corrupted'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter "to" is corrupted'), $die);
return false;
}
if (!is_array($templateVars))
{
Tools::dieOrLog(Tools::displayError('Error: parameter \\"templateVars\\" is not an array'), $die);
Tools::dieOrLog(Tools::displayError('Error: parameter "templateVars" is not an array'), $die);
return false;
}