Merge remote-tracking branch 'origin/pull/12721'

This commit is contained in:
Michal Čihař 2016-11-28 14:25:00 +01:00
commit 2a2b52bbec

View File

@ -67,14 +67,6 @@ class Response
* @var bool
*/
private $_isDisabled;
/**
* Whether we are servicing an ajax request for a page
* that was fired using the generic page handler in JS.
*
* @access private
* @var bool
*/
private $_isAjaxPage;
/**
* Whether there were any errors during the processing of the request
* Only used for ajax responses
@ -108,16 +100,10 @@ class Response
$this->_isSuccess = true;
$this->_isAjax = false;
$this->_isAjaxPage = false;
$this->_isDisabled = false;
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$this->_isAjax = true;
}
if (isset($_REQUEST['ajax_page_request'])
&& $_REQUEST['ajax_page_request'] == true
) {
$this->_isAjaxPage = true;
}
$this->_header->setAjax($this->_isAjax);
$this->_footer->setAjax($this->_isAjax);
$this->_CWD = getcwd();