// MERGE with trunk revision 7754

This commit is contained in:
rMalie
2011-07-27 12:48:42 +00:00
parent 21017fb5d8
commit 233c0076b7
182 changed files with 6179 additions and 1333 deletions
+2 -10
View File
@@ -30,8 +30,6 @@ require_once(dirname(__FILE__).'/../../init.php');
require_once(dirname(__FILE__).'/WishList.php');
require_once(dirname(__FILE__).'/blockwishlist.php');
$errors = array();
$action = Tools::getValue('action');
$add = (!strcmp($action, 'add') ? 1 : 0);
$delete = (!strcmp($action, 'delete') ? 1 : 0);
@@ -42,7 +40,7 @@ $id_product_attribute = (int)(Tools::getValue('id_product_attribute'));
if (Configuration::get('PS_TOKEN_ENABLE') == 1 AND
strcmp(Tools::getToken(false), Tools::getValue('token')) AND
$cookie->isLogged() === true)
$errors[] = Tools::displayError('Invalid token');
echo Tools::displayError('Invalid token');
if ($cookie->isLogged())
{
if ($id_wishlist AND WishList::exists($id_wishlist, $cookie->id_customer) === true)
@@ -78,10 +76,4 @@ if ($cookie->isLogged())
echo Tools::displayError('No template found');
}
else
$errors[] = Tools::displayError('You must be logged in to manage your wishlist.');
if (sizeof($errors))
{
$smarty->assign('errors', $errors);
$smarty->display(_PS_THEME_DIR_.'errors.tpl');
}
echo Tools::displayError('You must be logged in to manage your wishlist.');