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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Marc Delisle 2014-12-04 09:16:02 -05:00
commit a5d9c59bae
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -14,7 +14,7 @@ phpMyAdmin - ChangeLog
- bug #4614 Separator between "Show All" and "Number of rows" disappears
- bug #4615 SQL highlighting in process list breaks on auto refresh
- bug #4616 Warning in db structure print view page
- bug Undefined index navwork
- bug Undefined index navwork, savedsearcheswork
4.3.0.0 (not yet released)
+ rfe #1502 Smart sorting for int keys

4
libraries/relation.lib.php
View File

@ -349,7 +349,9 @@ function PMA_getDiagMessageForFeature($feature_name,
$relation_parameter, $messages, $skip_line = true
) {
$retval = ' <tr><td colspan=2 class="right">' . $feature_name . ': ';
if ($GLOBALS['cfgRelation'][$relation_parameter]) {
if (isset($GLOBALS['cfgRelation'][$relation_parameter])
&& $GLOBALS['cfgRelation'][$relation_parameter]
) {
$retval .= $messages['enabled'];
} else {
$retval .= $messages['disabled'];