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

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-08-21 11:47:34 +02:00
commit 87ec560346
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/classes/Error.php
View File

@ -104,10 +104,15 @@ class Error extends Message
$this->setFile($errfile);
$this->setLine($errline);
$backtrace = debug_backtrace();
// remove last three calls:
// debug_backtrace(), handleError() and addError()
$backtrace = array_slice($backtrace, 3);
// This function can be disabled in php.ini
if (function_exists('debug_backtrace')) {
$backtrace = @debug_backtrace();
// remove last three calls:
// debug_backtrace(), handleError() and addError()
$backtrace = array_slice($backtrace, 3);
} else {
$backtrace = array();
}
$this->setBacktrace($backtrace);
}

2
libraries/classes/Plugins/Export/ExportSql.php
View File

@ -1388,7 +1388,7 @@ class ExportSql extends ExportPlugin
// need to use PhpMyAdmin\DatabaseInterface::QUERY_STORE
// with $GLOBALS['dbi']->numRows() in mysqli
$result = $GLOBALS['dbi']->query(
$result = $GLOBALS['dbi']->tryQuery(
'SHOW TABLE STATUS FROM ' . Util::backquote($db)
. ' WHERE Name = \'' . $GLOBALS['dbi']->escapeString($table) . '\'',
null,