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

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-04-14 10:01:05 +05:30
commit b398635e1a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
+ rfe #1639 Add grouping to stored procedures in the navigation tree
4.4.3.0 (not yet released)
- bug #4851 PHP errors in login dialogue
4.4.2.0 (2015-04-13)
- bug #4835 PMA_hideShowConnection not called after submit_num_fields

1
libraries/common.inc.php
View File

@ -1189,6 +1189,7 @@ if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
// If Zero configuration mode enabled, check PMA tables in current db.
if (! defined('PMA_MINIMUM_COMMON')
&& ! empty($GLOBALS['server'])
&& isset($GLOBALS['cfg']['ZeroConf'])
&& $GLOBALS['cfg']['ZeroConf'] == true
) {