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:
authorSampath Liyanage <plbsam@gmail.com>2014-02-28 00:20:33 +0400
committerSampath Liyanage <plbsam@gmail.com>2014-02-28 00:20:33 +0400
commit431c2ad5d803e989b01aa2a807f4e0ef42645e38 (patch)
tree4ca0f55724f458c1af93c454570b55d0d652ddc3 /db_search.php
parenteaf7e9be92c912afb9c6b25ed21727db53eabfae (diff)
DB Search bug fix
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
Diffstat (limited to 'db_search.php')
-rw-r--r--db_search.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/db_search.php b/db_search.php
index acfec8e55b..793fe91e88 100644
--- a/db_search.php
+++ b/db_search.php
@@ -40,11 +40,12 @@ $db_search = new PMA_DbSearch($GLOBALS['db']);
if ( $GLOBALS['is_ajax_request'] != true) {
include 'libraries/db_info.inc.php';
}
-$response->addHTML('<div id="searchresults">');
// Main search form has been submitted, get results
if (isset($_REQUEST['submit_search'])) {
$response->addHTML($db_search->getSearchResults());
+} else {
+ $response->addHTML('<div id="searchresults"></div>');
}
// If we are in an Ajax request, we need to exit after displaying all the HTML
@@ -53,5 +54,9 @@ if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])
}
// Display the search form
+$response->addHTML('<div id="togglesearchresultsdiv">'
+ . '<a id="togglesearchresultlink"></a></div>'
+ . '<br class="clearfloat" />');
$response->addHTML($db_search->getSelectionForm($url_params));
+$response->addHTML($db_search->_getResultDivs());
?>