diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index e86fed4f2..47f90037c 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -640,13 +640,13 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
$sql_constraints .= $crlf;
}
if (strpos($sql_lines[$j], 'CONSTRAINT') === FALSE) {
- $str_tmp = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
- $sql_constraints_query .= $str_tmp;
- $sql_constraints .= $str_tmp;
+ $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
+ $sql_constraints_query .= $tmp_str;
+ $sql_constraints .= $tmp_str;
} else {
- $str_tmp = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
- $sql_constraints_query .= $str_tmp;
- $sql_constraints .= $str_tmp;
+ $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
+ $sql_constraints_query .= $tmp_str;
+ $sql_constraints .= $tmp_str;
preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
if (! $first) {
$sql_drop_foreign_keys .= ', ';
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index e1e79f316..6127c3fad 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -227,17 +227,17 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
// prepare for db related
$db = $GLOBALS['db'];
// if you want navigation:
- $strDBLink = '';
// else use
- // $strDBLink = htmlspecialchars($db);
- $legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
+ // $tmp_db_link = htmlspecialchars($db);
+ $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
if (empty($query)) {
$query = str_replace('%d',
PMA_backquote($db), $GLOBALS['cfg']['DefaultQueryDatabase']);
@@ -252,17 +252,17 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
'SHOW FULL COLUMNS FROM ' . PMA_backquote($db)
. '.' . PMA_backquote($GLOBALS['table']));
- $strDBLink = '';
// else use
- // $strDBLink = htmlspecialchars($db);
- $legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
+ // $tmp_db_link = htmlspecialchars($db);
+ $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
if (empty($query) && count($fields_list)) {
$field_names = array();
foreach ($fields_list as $field) {