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

// merge 1.4 => 6117

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-04-29 09:09:38 +00:00
parent e60a8b9203
commit 56099fa735
29 changed files with 199 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockwishlist/cart.php
+3 -1
View File
@@ -28,6 +28,7 @@
require_once(dirname(__FILE__).'/../../config/config.inc.php');
require_once(dirname(__FILE__).'/../../init.php');
require_once(dirname(__FILE__).'/WishList.php');
require_once(dirname(__FILE__).'/blockwishlist.php');
$errors = array();
@@ -53,7 +54,8 @@ if ($cookie->isLogged())
if(!isset($cookie->id_wishlist) OR $cookie->id_wishlist == '')
{
$wishlist = new WishList();
$wishlist->name = 'My WishList';
$modWishlist = new BlockWishList();
$wishlist->name = $modWishlist->l('My wishlist');
$wishlist->id_customer = (int)($cookie->id_customer);
list($us, $s) = explode(' ', microtime());
srand($s * $us);
modules/blockwishlist/fr.php
+1
View File
@@ -10,6 +10,7 @@ $_MODULE['<{blockwishlist}prestashop>blockwishlist-ajax_09dc02ecbb078868a3a86dde
$_MODULE['<{blockwishlist}prestashop>blockwishlist-extra_15b94c64c4d5a4f7172e5347a36b94fd'] = 'Ajouter à ma liste';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_2715a65604e1af3d6933b61704865daf'] = 'Bloc liste de cadeaux';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_7244141a5de030c4c882556f4fd70a8b'] = 'Ajoute un bloc gérant les listes de cadeaux';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_4840f4437f55e68a587d358090b948d1'] = 'Ma liste de cadeaux';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_5ef2d617096ae7b47a83f3d4de9c84bd'] = 'Choix invalide pour l\'activation du module';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirmation';
$_MODULE['<{blockwishlist}prestashop>blockwishlist_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres enregistrés';