From 55dccb6138075ccab64b383bbcff94cfefadef79 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 23 Feb 2015 11:58:26 +0530
Subject: [PATCH] bug #4777 Some images are missing in Designer for original
 theme

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                     |  1 +
 libraries/db_designer.lib.php | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e07124a368..3bcca3c51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.11.0 (not yet released)
 - bug #4774 SQL links are completely wrong
 - bug #4768 MariaDB: version mismatch
+- bug #4777 Some images are missing in Designer for original theme
 
 4.3.10.0 (2015-02-20)
 - bug       Undefined index navwork
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index a46e912167..0f4fd5479d 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -701,32 +701,32 @@ function PMA_getDatabaseTables(
 
             if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) {
 
-                $html .= '<img src="' . $_SESSION['PMA_Theme']->getImgPath()
-                    . 'pmd/FieldKey_small.png" alt="*" />';
-
+                $html .= '<img src="'
+                    . $_SESSION['PMA_Theme']->getImgPath('pmd/FieldKey_small.png')
+                    . '" alt="*" />';
             } else {
 
-                $html .= '<img src="' . $_SESSION['PMA_Theme']->getImgPath()
-                    . 'pmd/Field_small';
-
+                $image = 'pmd/Field_small';
                 if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'text')
                 ) {
-                    $html .= '_char';
+                    $image .= '_char';
                 } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'int')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'float')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'double')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')
                 ) {
-                    $html .= '_int';
+                    $image .= '_int';
                 } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'date')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'time')
                     || strstr($tab_column[$t_n]["TYPE"][$j], 'year')
                 ) {
-                    $html .= '_date';
+                    $image .= '_date';
                 }
+                $image .= '.png';
 
-                $html .= '.png" alt="*" />';
+                $html .= '<img src="'
+                    . $_SESSION['PMA_Theme']->getImgPath($image) . '" alt="*" />';
             }
 
             $html .= htmlspecialchars(