Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-19 17:27:37 +01:00
commit 3f389bb205
2 changed files with 5 additions and 0 deletions

View File

@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
4.5.3.0 (not yet released)
- issue #11664 Online syntax verifier bug - "IF" on SELECT statement
- issue #11665 Format breaks query with COUNT()
- issue Undefinex index: SendErrorReports
4.5.2.0 (not yet released)
- issue #11589 Incorrect parameter in mysqli_fetch_fields()

View File

@ -288,6 +288,10 @@ class ErrorHandler
*/
public function getDispErrors()
{
// Not sure why but seen in 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') {