From 4cd51b9b9e0b7a608f6382b08196dc0a8a33b481 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 4 May 2012 09:20:34 +0000 Subject: [PATCH] [-] BO : translations errors : fix regex git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15068 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminTranslationsController.php | 4 +--- modules/blockwishlist/sendwishlist.php | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 2378434dd..51208ea4b 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -806,15 +806,13 @@ class AdminTranslationsControllerCore extends AdminController case 'errors': // Parsing file for all errors syntax - $regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U'; + $regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, ?(true|false))?\)/U'; break; case 'modules': // Parsing modules file if ($type_file == 'php') $regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; - else if ($type_file == 'displayError') - $regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U'; else $regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U'; break; diff --git a/modules/blockwishlist/sendwishlist.php b/modules/blockwishlist/sendwishlist.php index 9c43d8f83..623ce89e0 100644 --- a/modules/blockwishlist/sendwishlist.php +++ b/modules/blockwishlist/sendwishlist.php @@ -34,21 +34,21 @@ $context = Context::getContext(); if (Configuration::get('PS_TOKEN_ENABLE') == 1 AND strcmp(Tools::getToken(false), Tools::getValue('token')) AND $context->customer->isLogged() === true) - exit(Tools::displayError('invalid token',false)); + exit(Tools::displayError('invalid token', false)); if ($context->customer->isLogged()) { $id_wishlist = (int)(Tools::getValue('id_wishlist')); if (empty($id_wishlist) === true) - exit(Tools::displayError('Invalid wishlist',false)); + exit(Tools::displayError('Invalid wishlist', false)); for ($i = 1; empty($_POST['email'.strval($i)]) === false; ++$i) { $to = Tools::getValue('email'.$i); $wishlist = WishList::exists($id_wishlist, $context->customer->id, true); if ($wishlist === false) - exit(Tools::displayError('Invalid wishlist',false)); + exit(Tools::displayError('Invalid wishlist', false)); if (WishList::addEmail($id_wishlist, $to) === false) - exit(Tools::displayError('Wishlist send error',false)); + exit(Tools::displayError('Wishlist send error', false)); $toName = strval(Configuration::get('PS_SHOP_NAME')); $customer = $context->customer; if (Validate::isLoadedObject($customer))