// Removed deprecated file

stratboy · Dec 30, 2013 · a78717f · a78717f
1 parent 30ba927
commit a78717f
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 807 deletions.
diff --git a/admin-dev/functions.php b/admin-dev/functions.php
@@ -56,7 +56,7 @@ function bindDatepicker($id, $time)
 function includeDatepicker($id, $time = false)
 {
 	Tools::displayAsDeprecated();
-	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui.will.be.removed.in.1.6.js"></script>';
+	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/jquery.ui.core.min.js"></script>';
 	echo '<link type="text/css" rel="stylesheet" href="'.__PS_BASE_URI__.'js/jquery/ui/themes/ui-lightness/jquery.ui.theme.css" />';
 	echo '<link type="text/css" rel="stylesheet" href="'.__PS_BASE_URI__.'js/jquery/ui/themes/ui-lightness/jquery.ui.datepicker.css" />';	
 	$iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id);

diff --git a/classes/Language.php b/classes/Language.php
@@ -178,11 +178,12 @@ public function moveToIso($newIso)
 	  * Return an array of theme 
 	  *
 	  * @return array([theme dir] => array('name' => [theme name]))
-		* @deprecated will be removed in 1.6
+	  * @deprecated
 	  */
 	protected function _getThemesList()
 	{
 		Tools::displayAsDeprecated();
+
 		static $themes = array();
 
 		if (empty($themes))

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
@@ -455,8 +455,8 @@ public function initContent()
 	 */
 	public function displayHeader($display = true)
 	{
-		// This method will be removed in 1.6
 		Tools::displayAsDeprecated();
+
 		$this->initHeader();
 		$hook_header = Hook::exec('displayHeader');
 		if ((Configuration::get('PS_CSS_THEME_CACHE') || Configuration::get('PS_JS_THEME_CACHE')) && is_writable(_PS_THEME_DIR_.'cache'))
@@ -491,7 +491,6 @@ public function displayHeader($display = true)
 	 */
 	public function displayFooter($display = true)
 	{
-		// This method will be removed in 1.6
 		Tools::displayAsDeprecated();
 		$this->smartyOutputContent(_PS_THEME_DIR_.'footer.tpl');
 	}
@@ -511,7 +510,7 @@ public function redirect()
 	}
 
 	/**
-	 * 1.4 retrocompatibility - will be removed in 1.6
+	 * 1.4 retrocompatibility
 	 */
 	public function displayContent()
 	{
@@ -571,8 +570,8 @@ public function display()
 		}
 		else
 		{
-			// BEGIN - 1.4 retrocompatibility - will be removed in 1.6
 			Tools::displayAsDeprecated('layout.tpl is missing in your theme directory');
+
 			if ($this->display_header)
 				$this->smartyOutputContent(_PS_THEME_DIR_.'header.tpl');
 
@@ -583,7 +582,6 @@ public function display()
 
 			if ($this->display_footer)
 				$this->smartyOutputContent(_PS_THEME_DIR_.'footer.tpl');
-			// END - 1.4 retrocompatibility - will be removed in 1.6
 		}
 
 		return true;

diff --git a/config/defines.inc.php b/config/defines.inc.php
@@ -75,7 +75,6 @@
 define('_PS_FRONT_CONTROLLER_DIR_', _PS_ROOT_DIR_.'/controllers/front/');
 
 define('_PS_TOOL_DIR_', _PS_ROOT_DIR_.'/tools/');
-define('_PS_FPDF_PATH_',            _PS_TOOL_DIR_.'fpdf/'); // @deprecated will be removed in 1.6
 define('_PS_GEOIP_DIR_',            _PS_TOOL_DIR_.'geoip/');
 define('_PS_PEAR_XML_PARSER_PATH_', _PS_TOOL_DIR_.'pear_xml_parser/');
 define('_PS_SWIFT_DIR_', _PS_TOOL_DIR_.'swift/');

diff --git a/footer.php b/footer.php
@@ -24,10 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-/**
- * This file will be removed in 1.6
- */
-
 if (isset(Context::getContext()->controller))
 	$controller = Context::getContext()->controller;
 else

diff --git a/header.php b/header.php
@@ -24,10 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-/**
- * This file will be removed in 1.6
- */
-
 if (isset(Context::getContext()->controller))
 	$controller = Context::getContext()->controller;
 else

diff --git a/images.inc.php b/images.inc.php
@@ -24,10 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-/**
- * This file will be removed in 1.6
- */
-
 /**
   * @deprecated 1.5.0
   */

diff --git a/init.php b/init.php
@@ -24,10 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-/**
- * This file will be removed in 1.6
- */
-
 if (isset(Context::getContext()->controller))
 	$controller = Context::getContext()->controller;
 else

diff --git a/js/jquery/jquery-ui.will.be.removed.in.1.6.js b/js/jquery/jquery-ui.will.be.removed.in.1.6.js
diff --git a/js/retro-compat.js.php b/js/retro-compat.js.php
@@ -52,7 +52,7 @@
 				'jquery.hoverIntent.minified.js' => 
 					array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'),
 				'jquery-ui-1.8.10.custom.min.js' =>
-					array('new_file' => $jquery_folder.'jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
+					array('new_file' => $jquery_folder.'ui/jquery.ui.core.min.js', 'name' => ''),
 				'jquery.treeview.async.js' =>
 					array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'),
 				'jquery.treeview.edit.js' =>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,10 +24,6 @@ @@
     *  International Registered Trademark & Property of PrestaShop SA
     */
-    /**
-     * This file will be removed in 1.6
-     */
     /**
       * @deprecated 1.5.0
       */
@@ Expand Down @@