From e2eb8a28dad7d07ab24c84685d388d4b230a4f92 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Tue, 16 Aug 2011 00:04:44 +0200 Subject: [PATCH] PMA_backquote is not needed for string literals --- db_tracking.php | 6 +++--- libraries/Tracker.class.php | 4 ++-- tbl_tracking.php | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index df1106e83b..29d8cc85b1 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -67,9 +67,9 @@ require_once './libraries/db_links.inc.php'; $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' . - ' GROUP BY '. PMA_backquote('table_name') . - ' ORDER BY '. PMA_backquote('table_name') .' ASC'; + ' WHERE db_name = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' . + ' GROUP BY table_name' . + ' ORDER BY table_name ASC'; $all_tables_result = PMA_query_as_controluser($all_tables_query); diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 947044aa24..aa176eafb7 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -219,8 +219,8 @@ class PMA_Tracker $sql_query = " SELECT tracking_active FROM " . self::$pma_table . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($dbname) . "' " . - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($tablename) . "' " . + " WHERE db_name = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND table_name = '" . PMA_sqlAddSlashes($tablename) . "' " . " ORDER BY version DESC"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); diff --git a/tbl_tracking.php b/tbl_tracking.php index 76ed16ab33..b601348ea4 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -575,8 +575,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $sql_query = " SELECT DISTINCT db_name, table_name FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " . - " ORDER BY ". PMA_backquote('db_name') . ", " . PMA_backquote('table_name'); + " WHERE db_name = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " . + " ORDER BY db_name, table_name"; $sql_result = PMA_query_as_controluser($sql_query); @@ -615,9 +615,9 @@ if (PMA_DBI_num_rows($sql_result) > 0) { $sql_query = " SELECT * FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ". - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ". - " ORDER BY ". PMA_backquote('version') . " DESC "; + " WHERE db_name = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ". + " AND table_name = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ". + " ORDER BY version DESC "; $sql_result = PMA_query_as_controluser($sql_query); -- 2.11.4.GIT