//fix preview product url in BO

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15935 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur committed 2012-06-07 15:25:02 +00:00
1 parent 4ff5870789
commit 24608ca63c
1 file changed
+2 -3
@@ -2306,7 +2306,7 @@ class AdminProductsControllerCore extends AdminController
{ {
if (!ShopUrl::getMainShopDomain()) if (!ShopUrl::getMainShopDomain())
return false; return false;
$is_rewrite_active = (bool)Configuration::get('PS_REWRITING_SETTINGS');
$preview_url = $this->context->link->getProductLink( $preview_url = $this->context->link->getProductLink(
$product, $product,
$this->getFieldValue($product, 'link_rewrite', $this->context->language->id), $this->getFieldValue($product, 'link_rewrite', $this->context->language->id),
@@ -2315,9 +2315,8 @@ class AdminProductsControllerCore extends AdminController
null, null,
Context::getContext()->shop->id, Context::getContext()->shop->id,
0, 0,
true $is_rewrite_active
); );
if (!$product->active) if (!$product->active)
{ {
$preview_url = $this->context->link->getProductLink( $preview_url = $this->context->link->getProductLink(