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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-29 10:31:12 +01:00
parent d2e475dd3a 2b67d7072c
commit 9f2580f3bd
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocksharefb/blocksharefb.php
+3 -2
View File
@@ -19,7 +19,8 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA␍
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -63,7 +64,7 @@ class blocksharefb extends Module
if (isset($id_product) && $id_product != '')
{
$product_infos = new Product((int)$id_product, true, $cookie->id_lang);
$product_infos = $this->context->controller->getProduct();
$smarty->assign(array(
'product_link' => urlencode($link->getProductLink($product_infos)),
'product_title' => urlencode($product_infos->name),
modules/productcomments/productcomments.php
+1 -1
View File
@@ -705,7 +705,7 @@ class ProductComments extends Module
$this->context->smarty->assign(array(
'id_product_comment_form' => (int)Tools::getValue('id_product'),
'product' => new Product((int)Tools::getValue('id_product'), false, $this->context->language->id),
'product' => $this->context->controller->getProduct(),
'secure_key' => $this->secure_key,
'logged' => (int)$this->context->customer->isLogged(true),
'allow_guests' => (int)Configuration::get('PRODUCT_COMMENTS_ALLOW_GUESTS'),