[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20778-gb5e63b5

Marc Delisle lem9 at users.sourceforge.net
Mon Oct 10 14:55:38 CEST 2011


The branch, master has been updated
       via  b5e63b56a98ce5d46bf5c654c0427ec426688dfc (commit)
       via  a6fc7ac92836e6e25cb8efc98c014a0e3a7e55ca (commit)
      from  328defc9d99f6cb6e9450a6b708474923908faea (commit)


- Log -----------------------------------------------------------------
commit b5e63b56a98ce5d46bf5c654c0427ec426688dfc
Merge: 328defc a6fc7ac
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Oct 10 08:54:44 2011 -0400

    Fix merge conflicts

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    1 +
 navigation.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5ca9e7..a279813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
 - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
 - bug #3418849 [interface] Inline edit shows dropdowns even after closing
 - bug [view] View renaming did not work
+- bug [navi] Wrong icon for view (MySQL 5.5)
 
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/navigation.php b/navigation.php
index 126b00d..230040b 100644
--- a/navigation.php
+++ b/navigation.php
@@ -597,7 +597,7 @@ function PMA_displayTableList($tables, $visible = false,
                 .'&goto=' . $GLOBALS['cfg']['LeftDefaultTabTable']
                 . '" >';
             $attr = array('id' => 'icon_' . htmlspecialchars($table_db . '.' . $table['Name']));
-            if ('VIEW' === strtoupper($table['Comment'])) {
+            if (PMA_Table::isView($table_db, $table['Name'])) {
                 echo PMA_getImage('s_views.png', htmlspecialchars($link_title), $attr);
             } else {
                 echo PMA_getImage('b_browse.png', htmlspecialchars($link_title), $attr);


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list