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

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

Browse Source
This commit is contained in:
Weblate 2014-07-21 07:37:09 +02:00
commit 5870fc9e1e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.2.7.0 (not yet released)
- bug Broken links on home page
- bug #4494 Overlap in navigation panel
- bug #4427 Action icons not in horizontal order
4.2.6.0 (2014-07-17)
- bug #4471 Undefined index warning with referenced column.

4
libraries/display_structure.inc.php
View File

@ -21,9 +21,7 @@ if (! defined('PHPMYADMIN')) {
$HideStructureActions = '';
if (PMA_Util::showText('ActionLinksMode')
&& $GLOBALS['cfg']['HideStructureActions'] === true
) {
if ($GLOBALS['cfg']['HideStructureActions'] === true) {
$HideStructureActions .= ' HideStructureActions';
}