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

2013-02-07 10:46:37 +01:00
parent 34870f6c40 76c80680a2
commit 97481cbe84
30 changed files with 289 additions and 195 deletions
@@ -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;
 	}