Merge remote-tracking branch 'origin/master' into tyronm

1 files changed, 2 insertions, 2 deletions

diff --git a/db_tracking.php b/db_tracking.php
index c0421d600d..3a9b6954b7 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -67,7 +67,7 @@ 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']) . '\' ' .
+             ' WHERE ' . PMA_backquote('db_name')    . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' .
              ' GROUP BY '. PMA_backquote('table_name') .
              ' ORDER BY '. PMA_backquote('table_name') .' ASC';
 
@@ -110,7 +110,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
         $table_query = ' SELECT * FROM ' .
              PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' .
              PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
-             ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name`  = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\'';
+             ' WHERE `db_name` = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' AND `table_name`  = \'' . PMA_sqlAddSlashes($table_name) . '\' AND `version` = \'' . $version_number . '\'';
 
         $table_result = PMA_query_as_controluser($table_query);
         $version_data = PMA_DBI_fetch_array($table_result);