From d06a042ae19d98ce2e122f4a258f237bbe044689 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 9 Jul 2012 09:11:13 +0000
Subject: [PATCH] [-] BO : fixed bug #PSCFV-2878 - Displaying wrong link in the
 SEO tab of a product using multistore

---
 admin-dev/themes/default/template/controllers/products/seo.tpl | 2 +-
 controllers/admin/AdminProductsController.php                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index d779431f3..f4766d4ed 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -87,7 +87,7 @@
 			onmousedown="updateFriendlyURLByName();">{l s='Generate'}</a>&nbsp;
 			{l s='Friendly URL from product name.'}<br /><br />
 			{l s='Product link will look like this:'}
-			{if $ps_ssl_enabled}https://{else}http://{/if}{$smarty.server.SERVER_NAME}{$smarty.const.__PS_BASE_URI__}{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
+			{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
 		</td>
 	</tr>
 </table>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 3c928f264..27c3a9e16 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2715,7 +2715,8 @@ class AdminProductsControllerCore extends AdminController
 			'product' => $product,
 			'languages' => $this->_languages,
 			'default_language' => (int)Configuration::get('PS_LANG_DEFAULT'),
-			'ps_ssl_enabled' => Configuration::get('PS_SSL_ENABLED')
+			'ps_ssl_enabled' => Configuration::get('PS_SSL_ENABLED'),
+			'curent_shop_url' => $this->context->shop->getBaseURL()
 		));
 
 		$this->tpl_form_vars['custom_form'] = $data->fetch();