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

classes/Cart.php

@@ -1591,9 +1591,9 @@ class CartCore extends ObjectModel
 	 */
 	public function getPackageList($flush = false)
 	{
-		static $cache = false;
+		static $cache = array();
-		if ($cache !== false && !$flush)
+		if (isset($cache[(int)$this->id]) && $cache[(int)$this->id] !== false && !$flush)
-			return $cache;
+			return $cache[(int)$this->id];
 
 		$product_list = $this->getProducts();
 		// Step 1 : Get product informations (warehouse_list and carrier_list), count warehouse
@@ -1821,7 +1821,7 @@ class CartCore extends ObjectModel
 						);
 					}
 		}
-		$cache = $final_package_list;
+		$cache[(int)$this->id] = $final_package_list;
 		return $final_package_list;
 	}
 

classes/controller/FrontController.php

@@ -721,7 +721,9 @@ class FrontControllerCore extends Controller
 			$this->setMobileMedia();
 			return true;
 		}
-		$this->addCSS(_THEME_CSS_DIR_.'grid_prestashop.css', 'all');
+
+		if (Tools::file_exists_cache(_PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, _THEME_CSS_DIR_.'grid_prestashop.css')))
+			$this->addCSS(_THEME_CSS_DIR_.'grid_prestashop.css', 'all');
 		$this->addCSS(_THEME_CSS_DIR_.'global.css', 'all');
 		$this->addjquery();
 		$this->addjqueryPlugin('easing');

controllers/admin/AdminCustomerThreadsController.php

@@ -458,7 +458,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
 
 		$extension = false;
 		foreach ($extensions as $key => $val)
-			if (substr($filename, -4) == $key || substr($filename, -5) == $key)
+			if (substr(Tools::strtolower($filename), -4) == $key || substr(Tools::strtolower($filename), -5) == $key)
 			{
 				$extension = $val;
 				break;

controllers/admin/AdminMetaController.php

@@ -66,7 +66,7 @@ class AdminMetaControllerCore extends AdminController
 			),
 			'PS_ALLOW_ACCENTED_CHARS_URL' => array(
 				'title' => $this->l('Accented URL'),
-				'desc' => $this->l('Enable if you want to allow accented characters in your friendly URLs.'),
+				'desc' => $this->l('Enable if you want to allow accented characters in your friendly URLs.').' '.$this->l('You should only activate this option if you are using non-latin characters ; for all the latin charsets, your SEO will be better without this option.'),
 				'validation' => 'isBool',
 				'cast' => 'intval',
 				'type' => 'bool'

controllers/front/ContactController.php

@@ -57,7 +57,7 @@ class ContactControllerCore extends FrontController
 				$this->errors[] = Tools::displayError('Please select a subject from the list provided. ');
 			else if (!empty($_FILES['fileUpload']['name']) && $_FILES['fileUpload']['error'] != 0)
 				$this->errors[] = Tools::displayError('An error occurred during the file-upload process.');
-			else if (!empty($_FILES['fileUpload']['name']) && !in_array(substr($_FILES['fileUpload']['name'], -4), $extension) && !in_array(substr($_FILES['fileUpload']['name'], -5), $extension))
+			else if (!empty($_FILES['fileUpload']['name']) && !in_array(substr(Tools::strtolower($_FILES['fileUpload']['name']), -4), $extension) && !in_array(substr(Tools::strtolower($_FILES['fileUpload']['name']), -5), $extension))
 				$this->errors[] = Tools::displayError('Bad file extension');
 			else
 			{

controllers/front/ProductController.php

@@ -340,26 +340,39 @@ class ProductControllerCore extends FrontController
 	{
 		$images = $this->product->getImages((int)$this->context->cookie->id_lang);
 		$product_images = array();
+
+		if(isset($images[0]))
+			$this->context->smarty->assign('mainImage', $images[0]);
 		foreach ($images as $k => $image)
 		{
 			if ($image['cover'])
 			{
-				$this->context->smarty->assign('mainImage', $images[0]);
+				$this->context->smarty->assign('mainImage', $image);
 				$cover = $image;
 				$cover['id_image'] = (Configuration::get('PS_LEGACY_IMAGES') ? ($this->product->id.'-'.$image['id_image']) : $image['id_image']);
 				$cover['id_image_only'] = (int)$image['id_image'];
 			}
 			$product_images[(int)$image['id_image']] = $image;
 		}
+
 		if (!isset($cover))
-			$cover = array(
+		{
-				'id_image' => $this->context->language->iso_code.'-default', 
+			if(isset($images[0]))
-				'legend' => 'No picture', 
+			{
-				'title' => 'No picture'
+				$cover = $images[0];
+				$cover['id_image'] = (Configuration::get('PS_LEGACY_IMAGES') ? ($this->product->id.'-'.$images[0]['id_image']) : $images[0]['id_image']);
+				$cover['id_image_only'] = (int)$images[0]['id_image'];
+			}
+			else
+				$cover = array(
+					'id_image' => $this->context->language->iso_code.'-default',
+					'legend' => 'No picture',
+					'title' => 'No picture'
 				);
+		}
 		$size = Image::getSize(ImageType::getFormatedName('large'));
 		$this->context->smarty->assign(array(
-			'have_image' => Product::getCover((int)Tools::getValue('id_product')),
+			'have_image' => isset($cover['id_image'])? array((int)$cover['id_image']) : Product::getCover((int)Tools::getValue('id_product')),
 			'cover' => $cover,
 			'imgWidth' => (int)$size['width'],
 			'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')),
@@ -432,11 +445,37 @@ class ProductControllerCore extends FrontController
 				else
 					$combinations[$row['id_product_attribute']]['available_date'] = '';
 
-				if (isset($combination_images[$row['id_product_attribute']][0]['id_image']))
+				if (!isset($combination_images[$row['id_product_attribute']][0]['id_image']))
-					$combinations[$row['id_product_attribute']]['id_image'] = $combination_images[$row['id_product_attribute']][0]['id_image'];
-				else
 					$combinations[$row['id_product_attribute']]['id_image'] = -1;
+				else
+				{
+					$combinations[$row['id_product_attribute']]['id_image'] = $id_image = (int)$combination_images[$row['id_product_attribute']][0]['id_image'];
+					if ($row['default_on'] && $id_image > 0)
+					{
+						if (isset($this->context->smarty->tpl_vars['images']->value))
+							$product_images = $this->context->smarty->tpl_vars['images']->value;
+						if (is_array($product_images) && isset($product_images[$id_image]))
+						{
+							$product_images[$id_image]['cover'] = 1;
+							$this->context->smarty->assign('mainImage', $product_images[$id_image]);
+							if (count($product_images))
+								$this->context->smarty->assign('images', $product_images);
+						}
+						if (isset($this->context->smarty->tpl_vars['cover']->value))
+							$cover = $this->context->smarty->tpl_vars['cover']->value;
+						if (is_array($cover) && is_array($product_images))
+						{
+							$product_images[$cover['id_image']]['cover'] = 0;
+							if (isset($product_images[$id_image]))
+								$cover = $product_images[$id_image];
+							$cover['id_image'] = (Configuration::get('PS_LEGACY_IMAGES') ? ($this->product->id.'-'.$id_image) : (int)$id_image);
+							$cover['id_image_only'] = (int)$id_image;
+							$this->context->smarty->assign('cover', $cover);
+						}
+					}
+				}
 			}
+
 			// wash attributes list (if some attributes are unavailables and if allowed to wash it)
 			if (!Product::isAvailableWhenOutOfStock($this->product->out_of_stock) && Configuration::get('PS_DISP_UNAVAILABLE_ATTR') == 0)
 			{

modules/sendtoafriend/sendtoafriend-extra.tpl

@@ -45,7 +45,7 @@ $('document').ready(function(){
 				{/literal}url: "{$module_dir}sendtoafriend_ajax.php",{literal}
 				type: "POST",
 				headers: {"cache-control": "no-cache"},
-				data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: JSON.stringify(datas)},{/literal}{literal}
+				data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: unescape(JSON.stringify(datas).replace(/u/g, '%u'))},{/literal}{literal}
 				dataType: "json",
 				success: function(result){
 					$.fancybox.close();

themes/default/css/global.css

@@ -261,6 +261,7 @@ table.table_block {
 	border:1px solid #999;
 	border-bottom:none;
 	background:white;
+	border-collapse:inherit
 }
 table.std th,
 table.table_block th {
@@ -804,6 +805,7 @@ table#cart_summary .cart_total_price td.cart_voucher {
 
 table#cart_summary #total_price_container {
 	border-bottom:1px solid #999;
+	border-right: none;
 }
 
 .cart_voucher .title_block, .cart_voucher h4

themes/default/js/product.js

@@ -118,7 +118,7 @@ function findCombination(firstTime)
 
 			//show the large image in relation to the selected combination
 			if (combinations[combination]['image'] && combinations[combination]['image'] != -1)
-				displayImage( $('#thumb_' + combinations[combination]['image']).parent() );
+				displayImage($('#thumb_' + combinations[combination]['image']).parent());
 
 			//show discounts values according to the selected combination
 			if (combinations[combination]['idCombination'] && combinations[combination]['idCombination'] > 0)
@@ -414,17 +414,14 @@ function displayImage(domAAroundImgThumb, no_animation)
 {
 	if (typeof(no_animation) == 'undefined')
 		no_animation = false;
-	
 	if (domAAroundImgThumb.attr('href'))
 	{
-		var newSrc = domAAroundImgThumb.attr('href').replace('thickbox','large');
+		var newSrc = domAAroundImgThumb.attr('href').replace('thickbox', 'large');
 		if ($('#bigpic').attr('src') != newSrc)
 		{
-			$('#bigpic').fadeOut((no_animation ? 0 : 'fast'), function(){
+			$('#bigpic').attr('src', newSrc);
-				$(this).attr('src', newSrc).show();
+			if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
-				if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
+				$(this).attr('alt', domAAroundImgThumb.attr('href'));
-					$(this).attr('alt', domAAroundImgThumb.attr('href'));
-			});
 		}
 		$('#views_block li a').removeClass('shown');
 		$(domAAroundImgThumb).addClass('shown');
@@ -468,24 +465,29 @@ function serialScrollFixLock(event, targeted, scrolled, items, position)
 function refreshProductImages(id_product_attribute)
 {
 	$('#thumbs_list_frame').scrollTo('li:eq(0)', 700, {axis:'x'});
-	$('#thumbs_list li').hide();
+
 	id_product_attribute = parseInt(id_product_attribute);
 
-	if (typeof(combinationImages) != 'undefined' && typeof(combinationImages[id_product_attribute]) != 'undefined')
+	if (id_product_attribute > 0 && typeof(combinationImages) != 'undefined' && typeof(combinationImages[id_product_attribute]) != 'undefined')
 	{
+		$('#thumbs_list li').hide();
+		$('#thumbs_list').trigger('goto', 0);
 		for (var i = 0; i < combinationImages[id_product_attribute].length; i++)
 			$('#thumbnail_' + parseInt(combinationImages[id_product_attribute][i])).show();
-	}
+		if (parseInt($('#thumbs_list_frame >li:visible').length) < parseInt($('#thumbs_list_frame >li').length))
-	if (i > 0)
+			$('#wrapResetImages').show('slow');
-	{
+		else
-		var thumb_width = $('#thumbs_list_frame >li').width() + parseInt($('#thumbs_list_frame >li').css('marginRight'));
+			$('#wrapResetImages').hide('slow');
-		$('#thumbs_list_frame').width((parseInt((thumb_width)* i) + 3) + 'px'); //  Bug IE6, needs 3 pixels more ?
 	}
 	else
 	{
-		$('#thumbnail_' + idDefaultImage).show();
+		$('#thumbs_list li').show();
-		displayImage($('#thumbnail_' + idDefaultImage + ' a'));
+		if (parseInt($('#thumbs_list_frame >li').length) == parseInt($('#thumbs_list_frame >li:visible').length))
+			$('#wrapResetImages').hide('slow');
 	}
+
+	var thumb_width = $('#thumbs_list_frame >li').width() + parseInt($('#thumbs_list_frame >li').css('marginRight'));
+	$('#thumbs_list_frame').width((parseInt((thumb_width) * $('#thumbs_list_frame >li').length)) + 'px');
 	$('#thumbs_list').trigger('goto', 0);
 	serialScrollFixLock('', '', '', '', 0);// SerialScroll Bug on goto 0 ?
 }
@@ -548,6 +550,11 @@ $(document).ready(function()
 		$('#customizedDatas').append(uploading_in_progress);
 	});
 
+	original_url = window.location + '';
+	first_url_check = true;
+	checkUrl();
+	initLocationChange();
+
 	//init the price in relation of the selected attributes
 	if (typeof productHasAttributes != 'undefined' && productHasAttributes)
 		findCombination(true);
@@ -563,11 +570,6 @@ $(document).ready(function()
 		'transitionIn'	: 'elastic',
 		'transitionOut'	: 'elastic'
 	});
-	original_url = window.location + '';
-	first_url_check = true;
-	checkUrl();
-	initLocationChange();
-	
 });
 
 function saveCustomization()
@@ -668,12 +670,12 @@ function getProductAttribute()
 function initLocationChange(time)
 {
 	if(!time) time = 500;
-	setInterval(checkUrl, time);
+		setInterval(checkUrl, time);
 }
 
 function checkUrl()
 {
-	if (original_url != window.url || first_url_check)
+	if (original_url != window.location || first_url_check)
 	{
 		first_url_check = false;
 		url = window.location + '';
@@ -710,7 +712,7 @@ function checkUrl()
 			if (count >= 0)
 			{
 				findCombination(false);
-				original_url = window.location + '';
+				original_url = url;
 			}
 			// no combination found = removing attributes from url
 			else

themes/default/product.tpl

@@ -200,8 +200,8 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 					{foreach from=$images item=image name=thumbnails}
 					{assign var=imageIds value="`$product->id`-`$image.id_image`"}
 					<li id="thumbnail_{$image.id_image}">
-						<a href="{$link->getImageLink($product->link_rewrite, $imageIds, thickbox_default)}" rel="other-views" class="thickbox {if $smarty.foreach.thumbnails.first}shown{/if}" title="{$image.legend|htmlspecialchars}">
+						<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$image.legend|htmlspecialchars}">
-							<img class="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')}" alt="{$image.legend|htmlspecialchars}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
+							<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')}" alt="{$image.legend|htmlspecialchars}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
 						</a>
 					</li>
 					{/foreach}
@@ -281,11 +281,11 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				{foreach from=$groups key=id_attribute_group item=group}
 					{if $group.attributes|@count}
 						<fieldset class="attribute_fieldset">
-							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
+							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :&nbsp;</label>
 							{assign var="groupName" value="group_$id_attribute_group"}
 							<div class="attribute_list">
 							{if ($group.group_type == 'select')}
-								<select name="{$groupName}" id="group_{$id_attribute_group|intval}" class="attribute_select" onchange="findCombination();getProductAttribute();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if};">
+								<select name="{$groupName}" id="group_{$id_attribute_group|intval}" class="attribute_select" onchange="findCombination();getProductAttribute();">
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
 										<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
 									{/foreach}
@@ -295,9 +295,9 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 									{assign var="default_colorpicker" value=""}
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
 									<li{if $group.default == $id_attribute} class="selected"{/if}>
-										<a id="color_{$id_attribute|intval}" class="color_pick{if ($group.default == $id_attribute)} selected{/if}" style="background: {$colors.$id_attribute.value};" title="{$colors.$id_attribute.name}" onclick="colorPickerClick(this);getProductAttribute();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if}">
+										<a id="color_{$id_attribute|intval}" class="color_pick{if ($group.default == $id_attribute)} selected{/if}" style="background: {$colors.$id_attribute.value};" title="{$colors.$id_attribute.name}" onclick="colorPickerClick(this);getProductAttribute();">
 											{if file_exists($col_img_dir|cat:$id_attribute|cat:'.jpg')}
-												<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$colors.$id_attribute.name}" width="20" height="20" /><br>
+												<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$colors.$id_attribute.name}" width="20" height="20" /><br />
 											{/if}
 										</a>
 									</li>
@@ -311,7 +311,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 								<ul>
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
 										<li>
-											<input type="radio" class="attribute_radio" name="{$groupName}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if} onclick="findCombination();getProductAttribute();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if}">
+											<input type="radio" class="attribute_radio" name="{$groupName}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if} onclick="findCombination();getProductAttribute();" />
 											<span>{$group_attribute|escape:'htmlall':'UTF-8'}</span>
 										</li>
 									{/foreach}
@@ -540,7 +540,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 					{foreach from=$accessories item=accessory name=accessories_list}
 						{if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)}
 							{assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)}
-							<li class="ajax_block_product {if $smarty.foreach.accessories_list.first}first_item{elseif $smarty.foreach.accessories_list.last}last_item{else}item{/if} product_accessories_description">
+							<li class="ajax_block_product{if $smarty.foreach.accessories_list.first} first_item{elseif $smarty.foreach.accessories_list.last} last_item{else} item{/if} product_accessories_description">
 								<p class="s_title_block">
 									<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}">{$accessory.name|escape:'htmlall':'UTF-8'}</a>
 									{if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} - <span class="price">{if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}</span>{/if}
@@ -613,7 +613,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 						{if $field.type == 1}
 						<li class="customizationUploadLine{if $field.required} required{/if}">
 							<label for ="textField{$customizationField}">{assign var='key' value='textFields_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} {if !empty($field.name)}{$field.name}{/if}{if $field.required}<sup>*</sup>{/if}</label>
-							<textarea type="text" name="textField{$field.id_customization_field}" id="textField{$customizationField}" rows="1" cols="40" class="customization_block_input" />{if isset($textFields.$key)}{$textFields.$key|stripslashes}{/if}</textarea>
+							<textarea type="text" name="textField{$field.id_customization_field}" id="textField{$customizationField}" rows="1" cols="40" class="customization_block_input">{if isset($textFields.$key)}{$textFields.$key|stripslashes}{/if}</textarea>
 						</li>
 						{counter}
 						{/if}
@@ -636,13 +636,10 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 	</div>
 </div>
 {/if}
-
 {if isset($packItems) && $packItems|@count > 0}
 	<div id="blockpack">
 		<h2>{l s='Pack content'}</h2>
 		{include file="$tpl_dir./product-list.tpl" products=$packItems}
 	</div>
 {/if}
-
 {/if}
-