gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Register shutdown directly on singleton instance

Browse Source 
This avoids additional call in the shutdown handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-12-15 09:04:50 +01:00
parent f08907544d
commit 4e9a342794
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/Response.php
View File

@ -89,7 +89,7 @@ class Response
if (! defined('TESTSUITE')) {
$buffer = OutputBuffering::getInstance();
$buffer->start();
register_shutdown_function(array('PMA\libraries\Response', 'response'));
register_shutdown_function(array($this, 'response'));
}
$this->_header = new Header();
$this->_HTML = '';
@ -419,21 +419,19 @@ class Response
/**
* Sends an HTML response to the browser
*
* @static
* @return void
*/
public static function response()
public function response()
{
$response = Response::getInstance();
chdir($response->getCWD());
chdir($this->getCWD());
$buffer = OutputBuffering::getInstance();
if (empty($response->_HTML)) {
$response->_HTML = $buffer->getContents();
if (empty($this->_HTML)) {
$this->_HTML = $buffer->getContents();
}
if ($response->isAjax()) {
$response->_ajaxResponse();
if ($this->isAjax()) {
$this->_ajaxResponse();
} else {
$response->_htmlResponse();
$this->_htmlResponse();
}
$buffer->flush();
exit;