From be250c9eccc223c91786400e475bccb931804544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 18 Apr 2013 11:36:55 +0200 Subject: [PATCH] // Revert a93cfbec07432ce9104e32075eb5da3871899d85 --- classes/controller/Controller.php | 4 ++-- tools/profiling/Controller.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index 0d4591455..27ebaf040 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -175,8 +175,8 @@ abstract class ControllerCore // then using displayAjax[action] if ($this->ajax) { - $action = Tools::toCamelCase(Tools::getValue('action', true)); - if (!empty($action) && method_exists($this, $action)) + $action = Tools::getValue('action'); + if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action, true))) $this->{'displayAjax'.$action}(); elseif (method_exists($this, 'displayAjax')) $this->displayAjax(); diff --git a/tools/profiling/Controller.php b/tools/profiling/Controller.php index 923faccec..16aec04d7 100644 --- a/tools/profiling/Controller.php +++ b/tools/profiling/Controller.php @@ -227,8 +227,8 @@ abstract class Controller extends ControllerCore // then using displayAjax[action] if ($this->ajax) { - $action = 'displayAjax'.Tools::toCamelCase(Tools::getValue('action', true)); - if (!empty($action) && method_exists($this, $action)) + $action = Tools::getValue('action'); + if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action))) $this->{'displayAjax'.$action}(); elseif (method_exists($this, 'displayAjax')) $this->displayAjax();