From 22ba2d81479446d1e1b41027c828a420f9a4e136 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Fri, 10 May 2013 12:09:51 +0530
Subject: [PATCH 1/2] Bug #3919 PropertiesIconic not honored fixed (cherry
 picked from commit 01c57f71ca535e853dbb0c3a3a03cdfc3ea49b6b)

---
 libraries/Util.class.php                   | 16 +++++++++-------
 test/libraries/common/PMA_getIcon_test.php |  4 +++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 5d3e77b38f..0c844946cc 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -95,11 +95,13 @@ class PMA_Util
      * @param string  $icon       name of icon file
      * @param string  $alternate  alternate text
      * @param boolean $force_text whether to force alternate text to be displayed
+     * @param boolean $menu_icon  whether this icon is for the menu bar or not
      *
      * @return string an html snippet
      */
-    public static function getIcon($icon, $alternate = '', $force_text = false)
-    {
+    public static function getIcon($icon, $alternate = '', $force_text = false,
+        $menu_icon = false
+    ) {
         // $cfg['PropertiesIconic'] is true or both
         $include_icon = ($GLOBALS['cfg']['PropertiesIconic'] !== false);
         // $cfg['PropertiesIconic'] is false or both
@@ -107,8 +109,9 @@ class PMA_Util
         $include_text = ($force_text
             || ($GLOBALS['cfg']['PropertiesIconic'] !== true));
 
-        // Always use a span (we rely on this in js/sql.js)
-        $button = '<span class="nowrap">';
+        // Sometimes use a span (we rely on this in js/sql.js). But for menu bar
+        // we don't need a span
+        $button = $menu_icon ? '' : '<span class="nowrap">';
         if ($include_icon) {
             $button .= self::getImage($icon, $alternate);
         }
@@ -118,7 +121,7 @@ class PMA_Util
         if ($include_text) {
             $button .= $alternate;
         }
-        $button .= '</span>';
+        $button .= $menu_icon ? '' : '</span>';
 
         return $button;
     }
@@ -1797,8 +1800,7 @@ class PMA_Util
             // avoid generating an alt tag, because it only illustrates
             // the text that follows and if browser does not display
             // images, the text is duplicated
-            $tab['text'] = self::getImage(htmlentities($tab['icon']))
-                . $tab['text'];
+            $tab['text'] = self::getIcon($tab['icon'], $tab['text'], false, true);
 
         } elseif (empty($tab['text'])) {
             // check to not display an empty link-text
diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php
index bc3f0581ed..781af64532 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -57,10 +57,12 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['PropertiesIconic'] = true;
         $alternate_text = 'alt_str';
 
+        // Here we are checking for an icon embeded inside a span (i.e not a menu
+        // bar icon
         $this->assertEquals(
             '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment" /> ' . $alternate_text . '</span>',
-            PMA_Util::getIcon('b_comment.png', $alternate_text, true)
+            PMA_Util::getIcon('b_comment.png', $alternate_text, true, false)
         );
 
     }

From 8473a5f78915f1b25dcdb2c8fc51428744cfb678 Mon Sep 17 00:00:00 2001
From: "J.M" <me@mynetx.net>
Date: Tue, 14 May 2013 12:01:07 +0200
Subject: [PATCH 2/2] add changelog entry for bug #3919 PropertiesIconic not
 honored

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index cadd66f981..373736065e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 values 
 - bug #3898 Structure not refreshed after column drop 
 - bug #3926 View is not updatable
+- bug #3919 PropertiesIconic not honored
 
 4.0.1.0 (not yet released)
 - bug #3879 Import broken for CSV using LOAD DATA