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

Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

Browse Source
This commit is contained in:
Weblate 2017-02-22 08:55:41 +01:00
commit a268c2a4b3
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/ErrorHandler.php
View File

@ -326,20 +326,12 @@ class ErrorHandler
*/
public function getDispErrors()
{
// Not sure why but seen in https://reports.phpmyadmin.net/
if (empty($GLOBALS['cfg']['SendErrorReports'])) {
$GLOBALS['cfg']['SendErrorReports'] = 'ask';
}
$retval = '';
// display errors if SendErrorReports is set to 'ask'.
if ($GLOBALS['cfg']['SendErrorReports'] != 'never') {
foreach ($this->getErrors() as $error) {
if ($error instanceof Error) {
if (! $error->isDisplayed()) {
$retval .= $error->getDisplay();
}
} else {
$retval .= var_export($error, true);
if (! $error->isDisplayed()) {
$retval .= $error->getDisplay();
}
}
} else {
@ -411,7 +403,6 @@ class ErrorHandler
$this->errors[$hash] = $error;
}
}
//$this->errors = array_merge($_SESSION['errors'], $this->errors);
// delete stored errors
$_SESSION['errors'] = array();