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:
authorMaurício Meneghini Fauth <mauriciofauth@gmail.com>2017-09-27 02:18:23 +0300
committerMaurício Meneghini Fauth <mauriciofauth@gmail.com>2017-09-27 02:18:23 +0300
commit32d6e81d5252b40c83e8adb89bf532fbdf8b714b (patch)
treeb2e8df758bf76a92603c9eb97075d1b62133f39f /db_search.php
parent3a00dd69a5655f700a2e379b453e851124dcdce9 (diff)
Move DbSearch to Database/Search
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'db_search.php')
-rw-r--r--db_search.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/db_search.php b/db_search.php
index 01cc70e718..806fd27df4 100644
--- a/db_search.php
+++ b/db_search.php
@@ -8,14 +8,15 @@
* @package PhpMyAdmin
*/
+use PhpMyAdmin\Database\Search;
+use PhpMyAdmin\Response;
+use PhpMyAdmin\Util;
+
/**
- * Gets some core libraries
- */
+* Gets some core libraries
+*/
require_once 'libraries/common.inc.php';
-use PhpMyAdmin\Response;
-use PhpMyAdmin\DbSearch;
-
$response = Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
@@ -28,7 +29,7 @@ require 'libraries/db_common.inc.php';
// If config variable $GLOBALS['cfg']['UseDbSearch'] is on false : exit.
if (! $GLOBALS['cfg']['UseDbSearch']) {
- PhpMyAdmin\Util::mysqlDie(
+ Util::mysqlDie(
__('Access denied!'), '', false, $err_url
);
} // end if
@@ -36,7 +37,7 @@ $url_query .= '&amp;goto=db_search.php';
$url_params['goto'] = 'db_search.php';
// Create a database search instance
-$db_search = new DbSearch($GLOBALS['db']);
+$db_search = new Search($GLOBALS['db']);
// Display top links if we are not in an Ajax request
if (! $response->isAjax()) {
@@ -50,7 +51,7 @@ if (! $response->isAjax()) {
$tooltip_truename,
$tooltip_aliasname,
$pos
- ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+ ) = Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
}
// Main search form has been submitted, get results