[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9338-gd2de55c

[Michal Čihař]

The branch, master has been updated
       via  d2de55cb0b40c8c8d475f85f6318ec85e4b97701 (commit)
       via  1b812f2d25189b4903028d7f98793542559b1d14 (commit)
      from  29fc903dc9a3b191cfea55fc112c095a78827605 (commit)


- Log -----------------------------------------------------------------
commit d2de55cb0b40c8c8d475f85f6318ec85e4b97701
Merge: 29fc903dc9a3b191cfea55fc112c095a78827605 1b812f2d25189b4903028d7f98793542559b1d14
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Aug 31 11:44:30 2010 +0200

    Merge branch 'QA_3_3'

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

Summary of changes:
 libraries/common.lib.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6f7064a..2a05638 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1087,6 +1087,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
 
         // Basic url query part
         $url_params = array();
+        if (! isset($GLOBALS['db'])) {
+            $GLOBALS['db'] = '';
+        }
         if (strlen($GLOBALS['db'])) {
             $url_params['db'] = $GLOBALS['db'];
             if (strlen($GLOBALS['table'])) {


hooks/post-receive
-- 
phpMyAdmin