Fix #12399: Adding index to table shows wrong top navigation

If the SQL query analyzing sets the $table value to '', don't update the original value Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
phpmyadmin · Aug 1, 2016 · 2c5541a · 2c5541a
1 parent 9ee479b
commit 2c5541a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/import.php b/import.php
@@ -742,10 +742,14 @@
     list(
         $analyzed_sql_results,
         $db,
-        $table
+        $table_from_sql
     ) = PMA_parseAnalyze($sql_query, $db);
     // @todo: possibly refactor
     extract($analyzed_sql_results);
+
+    if ($table != $table_from_sql && !empty($table_from_sql)) {
+        $table = $table_from_sql;
+    }
 }
 
 // There was an error?
@@ -774,11 +778,15 @@
         list(
             $analyzed_sql_results,
             $db,
-            $table
+            $table_from_sql
         ) = PMA_parseAnalyze($sql_query, $db);
         // @todo: possibly refactor
         extract($analyzed_sql_results);
 
+        if ($table != $table_from_sql && !empty($table_from_sql)) {
+            $table = $table_from_sql;
+        }
+
         $html_output .= PMA_executeQueryAndGetQueryResponse(
             $analyzed_sql_results, // analyzed_sql_results
             false, // is_gotofile

diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
@@ -2035,10 +2035,14 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
         list(
             $analyzed_sql_results,
             $db,
-            $table
+            $table_from_sql
         ) = PMA_parseAnalyze($sql_query, $db);
         // @todo: possibly refactor
         extract($analyzed_sql_results);
+
+        if ($table != $table_from_sql && !empty($table_from_sql)) {
+            $table = $table_from_sql;
+        }
     }
 
     $html_output = PMA_executeQueryAndGetQueryResponse(

diff --git a/sql.php b/sql.php
@@ -141,11 +141,15 @@
 list(
     $analyzed_sql_results,
     $db,
-    $table
+    $table_from_sql
 ) = PMA_parseAnalyze($sql_query, $db);
 // @todo: possibly refactor
 extract($analyzed_sql_results);
 
+if ($table != $table_from_sql && !empty($table_from_sql)) {
+    $table = $table_from_sql;
+}
+
 
 /**
  * Check rights in case of DROP DATABASE