Merge branch 'QA_3_5'

phpmyadmin · Aug 11, 2012 · 099dee4 · 099dee4
2 parents c7b04ee + 1228f48
commit 099dee4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -59,6 +59,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - [interface] Designer sometimes places tables on the top menu
 - bug #3546277 [core] Call to undefined function __() when config file has wrong permissions
 - bug #3540922 [edit] Error searching table with many fields
+- bug #3555104 [edit] Cannot copy a DB with table & views
 
 3.5.2.1 (2012-08-03)
 - [security] Fixed local path disclosure vulnerability, see PMASA-2012-3

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -854,6 +854,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
                 for (++$i; $i <= $last; $i++) {
                     if ($parsed_sql[$i]['type'] == $table_delimiter
                         && $parsed_sql[$i]['data'] == $backquoted_source_db
+                        && $parsed_sql[$i - 1]['type'] != 'punct_qualifier'
                     ) {
                         $parsed_sql[$i]['data'] = $target_for_view;
                     }