Don't redirect when no db is selected during ajax requests

phpmyadmin · Oct 30, 2012 · f0d15e3 · f0d15e3
1 parent b56871c
commit f0d15e3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
@@ -50,7 +50,16 @@
         . 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)