From f0d15e3cabe48b2831b9dd67398509dad87bf823 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Sun, 22 Jul 2012 14:27:43 +0100
Subject: [PATCH] Don't redirect when no db is selected during ajax requests

---
 libraries/db_common.inc.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index f583c9fda8..6cd4fc4688 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -50,7 +50,16 @@ if (! isset($is_db) || ! $is_db) {
         . PMA_generate_common_url('', '', '&')
         . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1';
     if (! strlen($db) || ! $is_db) {
-        PMA_sendHeaderLocation($uri);
+        $response = PMA_Response::getInstance();
+        if ($response->isAjax()) {
+            $response->isSuccess(false);
+            $response->addJSON(
+                'message',
+                PMA_Message::error(__('No databases selected.'))
+            );
+        } else {
+            PMA_sendHeaderLocation($uri);
+        }
         exit;
     }
 } // end if (ensures db exists)