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

2013-02-20 14:27:05 +01:00
parent 30e1ef8cc1 755573184c
commit e389d1dd70
9 changed files with 100 additions and 104 deletions
@@ -406,22 +406,6 @@ class FrontControllerCore extends Controller
 	}
 	
 	public function postProcess()
-	{
-		/*// For retrocompatibility with versions before 1.5, preProcess support will be removed on next release
-		if (method_exists(get_class($this), 'preProcess'))
-		{
-			$reflection = new ReflectionClass($this);
-			if (!in_array($reflection->getMethod('preProcess')->class, array('FrontController', 'FrontControllerCore')))
-			{
-				Tools::displayAsDeprecated('Method preProcess() is deprecated in controllers, use method postProcess() instead');
-				$this->preProcess();
-			}
-		}*/
-
-		//$this->preProcess();
-	}
-
-	public function preProcess()
 	{
 	}