Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-30 15:11:32 +02:00
commit 3c2746356f

View File

@ -129,7 +129,7 @@ class PMA_Util
$menu_icon = false, $control_param = 'ActionLinksMode'
) {
$include_icon = $include_text = false;
if (self::showIcons($control_param) {
if (self::showIcons($control_param)) {
$include_icon = true;
}
if ($force_text