Merge remote-tracking branch 'origin/development' into development

modules/blocklayered/blocklayered.js

@@ -230,12 +230,11 @@ function initLayered()
 
 function paginationButton() {
 	$('#pagination a').not(':hidden').each(function () {
-		if ($(this).attr('href').search(/&|\?p=/) == -1) {
-			var page = 1;
-		}
-		else {
-			var page = $(this).attr('href').replace(/^.*[&|\?]p=(\d+).*$/, '$1');
-		}
+		if ($(this).attr('href').search(/[&|\?]p=/) == -1)
+		    var page = 1;
+		else
+		    var page = $(this).attr('href').replace(/^.*[&|\?]p=(\d+).*$/, '$1');
+
 		var location = window.location.href.replace(/#.*$/, '');
 		$(this).attr('href', location+current_friendly_url.replace(/\/page-(\d+)/, '')+'/page-'+page);
 	});

modules/mailalerts/config.xml

@@ -2,7 +2,7 @@
         <module>
             <name>mailalerts</name>
             <displayName><![CDATA[Mail alerts]]></displayName>
-            <version><![CDATA[2.7]]></version>
+            <version><![CDATA[2.8]]></version>
             <description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[administration]]></tab>

modules/mailalerts/mailalerts.php

@@ -46,7 +46,7 @@ class MailAlerts extends Module
 	{
 		$this->name = 'mailalerts';
 		$this->tab = 'administration';
-		$this->version = '2.7';
+		$this->version = '2.8';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -383,7 +383,7 @@ class MailAlerts extends Module
 			'{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
 			'{invoice_phone}' => $invoice->phone ? $invoice->phone : $invoice->phone_mobile,
 			'{invoice_other}' => $invoice->other,
-			'{order_name}' => sprintf('%06d', $order->id),
+			'{order_name}' => $order->reference,
 			'{shop_name}' => $configuration['PS_SHOP_NAME'],
 			'{date}' => $order_date_text,
 			'{carrier}' => (($carrier->name == '0') ? $configuration['PS_SHOP_NAME'] : $carrier->name),

modules/productcomments/productcomments.tpl

@@ -98,6 +98,7 @@ var moderation_active = {$moderation_active};
 	<div id="new_comment_form">
 		<form id="id_new_comment_form" action="#">
 			<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
+			{if isset($product) && $product}
 			<div class="product clearfix">
 				<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
 				<div class="product_desc">
@@ -105,7 +106,7 @@ var moderation_active = {$moderation_active};
 					{$product->description_short}
 				</div>
 			</div>
-
+			{/if}
 			<div class="new_comment_form_content">
 				<h2>{l s='Write your review' mod='productcomments'}</h2>