dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix merge error

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9713 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2011-10-28 13:27:20 +00:00
parent a296e0192c
commit 3e3ff64cc5
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Controller.php
+11 -23
View File
@@ -134,32 +134,20 @@ abstract class ControllerCore
}
$this->initContent();
if ($this->display_footer || (isset($this->className) && $this->className))
$this->initFooter();
// postProcess handles ajaxProcess
$this->postProcess();
if ($this->display_header)
{
$this->setMedia();
$this->initHeader();
}
$this->initContent();
if ($this->display_footer)
$this->initFooter();
// default behavior for ajax process is to use $_POST[action] or $_GET[action]
// then using displayAjax[action]
if ($this->ajax)
{
$action = Tools::getValue('action');
if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
$this->{'displayAjax'.$action}();
elseif (method_exists($this, 'displayAjax'))
$this->displayAjax();
}
// default behavior for ajax process is to use $_POST[action] or $_GET[action]
// then using displayAjax[action]
if ($this->ajax)
{
$action = Tools::getValue('action');
if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
$this->{'displayAjax'.$action}();
elseif (method_exists($this, 'displayAjax'))
$this->displayAjax();
}
}
else
$this->initCursedPage();