[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1581-gc0c5723

[Michal Čihař]

The branch, master has been updated
       via  c0c5723b2038d30ab4f19d4a291770edf1c3779b (commit)
      from  30954728f30a9e8171d799dbd6de0abc87e1f563 (commit)


- Log -----------------------------------------------------------------
commit c0c5723b2038d30ab4f19d4a291770edf1c3779b
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Feb 2 13:44:33 2011 +0100

    Do not show 'Please select a database' when it is obvious.
    
    This makes sense when there is select box, but for list it is not
    needed.

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

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

diff --git a/navigation.php b/navigation.php
index 8c2b65c..c162aa2 100644
--- a/navigation.php
+++ b/navigation.php
@@ -308,7 +308,10 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
         .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" width="10" height="10" alt="' . _pgettext('short form', 'Create table') . '" />'
         . _pgettext('short form', 'Create table') . '</a></li></ul>';
 } elseif ($GLOBALS['cfg']['LeftFrameLight']) {
-    echo '<p>' . __('Please select a database') . '</p>';
+    /* No need to tell user to select database if we're showing complete list */
+    if (!$list) {
+        echo '<p>' . __('Please select a database') . '</p>';
+    }
 } else {
     echo '<div id="databaseList">' . "\n";
     $_url_params = array('pos' => $pos);


hooks/post-receive
-- 
phpMyAdmin