// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd

classes/AdminTab.php

@@ -159,8 +159,6 @@ abstract class AdminTabCore
 	protected $_includeVars = false;
 	protected $_includeContainer = true;
 
-	public $ajax = false;
-
 	public static $tabParenting = array(
 		'AdminProducts' => 'AdminCatalog',
 		'AdminCategories' => 'AdminCatalog',
@@ -235,14 +233,6 @@ abstract class AdminTabCore
 		return str_replace('"', '"', ($addslashes ? addslashes($str) : stripslashes($str)));
 	}
 
-	/**
-	 * ajaxDisplay is the default ajax return sytem 
-	 * 
-	 * @return void
-	 */
-	public function displayAjax()
-	{
-	}
 	/**
 	 * Manage page display (form, list...)
 	 */
@@ -516,24 +506,6 @@ abstract class AdminTabCore
 		return true;
 	}
 
-	/**
-	 * ajaxPreProcess is a method called in ajax-tab.php before displayConf(). 
-	 * 
-	 * @return void
-	 */
-	public function ajaxPreProcess()
-	{
-	}
-
-	/**
-	 * ajaxProcess is the default handle method for request with ajax-tab.php
-	 * 
-	 * @return void
-	 */
-	public function ajaxProcess()
-	{
-	}
-
 	/**
 	 * Manage page processing
 	 */
@@ -1135,9 +1107,9 @@ abstract class AdminTabCore
 	public function displayConf()
 	{
 		if ($conf = Tools::getValue('conf'))
-			echo '
-			<div class="conf">
-				<img src="../img/admin/ok2.png" alt="" /> '.$this->_conf[(int)($conf)].'
+			echo '<div class="conf">
+				<img src="../img/admin/ok2.png" />
+				'.$this->_conf[(int)($conf)].'
 			</div>';
 	}