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

classes/Cart.php

@@ -1191,6 +1191,7 @@ class CartCore extends ObjectModel
 			// refresh cache of self::_products
 			$this->_products = $this->getProducts(true);
 			CartRule::autoRemoveFromCart();
+			CartRule::autoAddToCart();
 			
 			return $return;
 		}

classes/HelpAccess.php

@@ -79,7 +79,7 @@ class HelpAccessCore
         $tooltip = '';
 
         $ctx = @stream_context_create(array('http' => array('timeout' => 10)));
-        $res = @file_get_contents($url, 0, $ctx);
+        $res = Tools::file_get_contents($url, false, $ctx);
 
 	    $infos = preg_split('/\|/', $res);
 	    if (count($infos) > 0)

classes/Manufacturer.php

@@ -110,7 +110,7 @@ class ManufacturerCore extends ObjectModel
 	{
 		$address = new Address($this->id_address);
 
-		if (!$address->delete())
+		if (Validate::isLoadedObject($address) AND !$address->delete())
 			return false;
 
 		if (parent::delete())

classes/ObjectModel.php

@@ -389,7 +389,7 @@ abstract class ObjectModelCore
 				return (int)$value;
 
 			case self::TYPE_FLOAT :
-				return (float)$value;
+				return (float)str_replace(',', '.', $value);
 
 			case self::TYPE_DATE :
 				if (!$value)

classes/controller/AdminController.php

@@ -175,6 +175,9 @@ class AdminControllerCore extends Controller
 
 	/** @var array required_fields to display in the Required Fields form */
 	public $required_fields = array();
+	
+	/** @var Helper */
+	protected $helper;
 
 	/**
 	 * @var array actions to execute on multiple selections
@@ -1635,6 +1638,8 @@ class AdminControllerCore extends Controller
 
 		// For each action, try to add the corresponding skip elements list
 		$helper->list_skip_actions = $this->list_skip_actions;
+		
+		$this->helper = $helper;
 	}
 
 	public function setMedia()
@@ -2790,7 +2795,7 @@ class AdminControllerCore extends Controller
 	{
 		$content = Tools::file_get_contents($external_file);
 		if ($content)
-			return file_put_contents(_PS_ROOT_DIR_.$file_to_refresh, $content);
+			return (bool)file_put_contents(_PS_ROOT_DIR_.$file_to_refresh, $content);
 		return false;
 	}
 

classes/log/FileLogger.php

@@ -37,7 +37,7 @@ class FileLoggerCore extends AbstractLogger
 	protected function logMessage($message, $level)
 	{
 		$formatted_message = '*'.$this->level_value[$level].'* '."\t".date('Y/m/d - H:i:s').': '.$message."\r\n";
-		return file_put_contents($this->getFilename(), $formatted_message, FILE_APPEND);
+		return (bool)file_put_contents($this->getFilename(), $formatted_message, FILE_APPEND);
 	}
 
 	/**