[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-362-gee5ff99

[Marc Delisle]

The branch, master has been updated
       via  ee5ff995fbf02a9d9e52de5375de862d67a9b3bf (commit)
      from  7ad5022987d534f17bce2d2615c46a21a1c15f63 (commit)


- Log -----------------------------------------------------------------
commit ee5ff995fbf02a9d9e52de5375de862d67a9b3bf
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Apr 18 08:02:16 2011 -0400

    Cannot create a table in information_schema

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

Summary of changes:
 navigation.php |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/navigation.php b/navigation.php
index b7b9602..167c060 100644
--- a/navigation.php
+++ b/navigation.php
@@ -304,9 +304,11 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
         echo __('No tables found in database.');
     }
     unset($table_list);
-    echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '">'
-        .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />'
-        . _pgettext('short form', 'Create table') . '</a></li></ul>';
+    if ($db != 'information_schema') {
+        echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '">'
+            .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />'
+            . _pgettext('short form', 'Create table') . '</a></li></ul>';
+    }
 } elseif ($GLOBALS['cfg']['LeftFrameLight']) {
     /* No need to tell user to select database if we're showing complete list */
     if (!$list) {


hooks/post-receive
-- 
phpMyAdmin