From 3d54060945b6ef3968e40f812c1ca7663fb5943b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Thu, 27 Jan 2011 10:01:17 +0100
Subject: [PATCH] Generate reload params on place where they are used.

This fixes reloading navigation frame when database is selected.
---
 libraries/navigation_header.inc.php | 4 ++++
 navigation.php                      | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 2b4606e29..fa5255a56 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -101,6 +101,10 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
     echo '</a>';
     echo '    ' . PMA_showMySQLDocu('', '', TRUE) . "\n";
 
+    $params = array('uniqid' => uniqid());
+    if (!empty($GLOBALS['db'])) {
+        $params['db'] = $GLOBALS['db'];
+    }
     echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">';
     if ($GLOBALS['cfg']['MainPageIconic']) {
         echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
diff --git a/navigation.php b/navigation.php
index 6f799d6bb..8c2b65c2a 100644
--- a/navigation.php
+++ b/navigation.php
@@ -49,10 +49,6 @@ require_once './libraries/common.inc.php';
  */
 function PMA_exitNavigationFrame()
 {
-    $params = array('uniqid' => uniqid());
-    if (!empty($GLOBALS['db'])) {
-        $params['db'] = $GLOBALS['db'];
-    }
     echo '</body></html>';
     exit;
 }