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

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

Browse Source
This commit is contained in:
Weblate 2014-12-19 14:04:43 +01:00
commit 57deba8567
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
- bug Fix initial replication configuration
- bug Undefined index central_columnswork
- bug #4657 Don't have default blowfish_secret
- bug #4656 Some error popups fade away too quickly
4.3.2.0 (2014-12-12)
- bug #4628 PHP error while exporting schema as PDF

3
libraries/Error_Handler.class.php
View File

@ -538,8 +538,7 @@ class PMA_Error_Handler
//ask user whether to submit errors or not.
if (!$response->isAjax()) {
// js code to show appropriate msgs, event binding & focusing.
$jsCode = 'PMA_ajaxShowMessage(PMA_messages["phpErrorsFound"], '
. ' 2000);'
$jsCode = 'PMA_ajaxShowMessage(PMA_messages["phpErrorsFound"]);'
. '$("#pma_ignore_errors_popup").bind("click", function() {
PMA_ignorePhpErrors()
});'