Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRouslan Placella <rouslan@placella.com>2012-06-19 13:45:35 +0400
committerRouslan Placella <rouslan@placella.com>2012-10-31 00:04:52 +0400
commit993db13788a94711b134880e1c73fc5359fc4165 (patch)
tree23e9b82584e5f13c9575db3990caf3f15ea7d6ac /db_search.php
parent5486bdb31205a69bd1fb7c55cae64d14c8519e2e (diff)
Fixed ajax-loaded db search pages
Diffstat (limited to 'db_search.php')
-rw-r--r--db_search.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/db_search.php b/db_search.php
index 01a9992195..51c6d31261 100644
--- a/db_search.php
+++ b/db_search.php
@@ -39,8 +39,8 @@ $db_search = new PMA_DbSearch($GLOBALS['db']);
// Display top links if we are not in an Ajax request
if ( $GLOBALS['is_ajax_request'] != true) {
include 'libraries/db_info.inc.php';
- $response->addHTML('<div id="searchresults">');
}
+$response->addHTML('<div id="searchresults">');
// Main search form has been submitted, get results
if (isset($_REQUEST['submit_search'])) {
@@ -48,10 +48,8 @@ if (isset($_REQUEST['submit_search'])) {
}
// If we are in an Ajax request, we need to exit after displaying all the HTML
-if ($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])) {
exit;
-} else {
- $response->addHTML('</div>');//end searchresults div
}
// Display the search form