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

classes/Cart.php

@@ -1088,7 +1088,7 @@ class CartCore extends ObjectModel
 			$id_customization = Db::getInstance()->Insert_ID();
 		}
 		
-		$field = preg_replace("/\<br\s*\/?\>/i", "\n", $field);
+		$field = preg_replace("/<br\s*\/?>/i", "\n", $field);
 		$query = 'INSERT INTO `'._DB_PREFIX_.'customized_data` (`id_customization`, `type`, `index`, `value`)
 			VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSQL($field).'\')';
 

controllers/front/CmsController.php

@@ -30,12 +30,13 @@ class CmsControllerCore extends FrontController
 	public $assignCase;
 	public $cms;
 	public $cms_category;
+	public $ssl = false;
 
 	public function canonicalRedirection($canonicalURL = '')
 	{
 		if (Tools::getValue('live_edit'))
 			return ;
-		if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms)))
+		if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms, $this->cms->link_rewrite, $this->ssl)))
 			parent::canonicalRedirection($canonicalURL);
 		else if (Validate::isLoadedObject($this->cms_category) && ($canonicalURL = $this->context->link->getCMSCategoryLink($this->cms_category)))
 			parent::canonicalRedirection($canonicalURL);
@@ -47,13 +48,16 @@ class CmsControllerCore extends FrontController
 	 */
 	public function init()
 	{
-		parent::init();
-
 		if ($id_cms = (int)Tools::getValue('id_cms'))
 			$this->cms = new CMS($id_cms, $this->context->language->id);
 		else if ($id_cms_category = (int)Tools::getValue('id_cms_category'))
 			$this->cms_category = new CMSCategory($id_cms_category, $this->context->language->id);
 
+		if (Configuration::get('PS_SSL_ENABLED') && Tools::getValue('content_only') && Tools::getValue('id_cms') == (int)Configuration::get('PS_CONDITIONS_CMS_ID') && Validate::isLoadedObject($this->cms))
+			$this->ssl = true;
+		
+		parent::init();
+
 		$this->canonicalRedirection();
 
 		// assignCase (1 = CMS page, 2 = CMS category)

controllers/front/ParentOrderController.php

@@ -511,7 +511,7 @@ class ParentOrderControllerCore extends FrontController
 
 		// TOS
 		$cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id);
-		$this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite);
+		$this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, (bool)Configuration::get('PS_SSL_ENABLED'));
 		if (!strpos($this->link_conditions, '?'))
 			$this->link_conditions .= '?content_only=1';
 		else

install-dev/classes/languages.php

@@ -138,7 +138,8 @@ class InstallLanguages
 		$args[0] = $translation;
 		if(count($args) > 1)
 			return call_user_func_array('sprintf', $args);
-		else return $translation;
+		else 
+			return $translation;
 	}
 
 	/**