Merge remote branch 'upstream/master'

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

libraries/Menu.class.php

@@ -172,7 +172,7 @@ class PMA_Menu
             if (strlen($this->_table)
                 && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')
             ) {
-                include_once './libraries/tbl_info.inc.php';
+                include './libraries/tbl_info.inc.php';
 
                 $retval .= $separator;
                 if ($GLOBALS['cfg']['NavigationBarIconic']) {

libraries/Table.class.php

@@ -782,7 +782,7 @@ class PMA_Table
 
         // do not create the table if dataonly
         if ($what != 'dataonly') {
-            require_once "libraries/plugin_interface.lib.php";
+            include_once "libraries/plugin_interface.lib.php";
             // get Export SQL instance
             $export_sql_plugin = PMA_getPlugin(
                 "export",
@@ -845,7 +845,7 @@ class PMA_Table
                 // this a view definition; we just found the first db name
                 // that follows DEFINER VIEW
                 // so change it for the new db name
-                        $parsed_sql[$i]['data'] = $target_for_view;
+                $parsed_sql[$i]['data'] = $target_for_view;
                 // then we have to find all references to the source db
                 // and change them to the target db, ensuring we stay into
                 // the $parsed_sql limits
@@ -854,6 +854,7 @@ class PMA_Table
                 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;
                     }

libraries/tbl_info.inc.php

@@ -63,14 +63,9 @@ if ($showtable) {
         $tbl_storage_engine = isset($showtable['Engine'])
             ? strtoupper($showtable['Engine'])
             : '';
-        // a new comment could be coming from tbl_operations.php
-        // and we want to show it in the header
-        if (isset($submitcomment) && isset($comment)) {
-            $show_comment = $comment;
-        } else {
-            $show_comment    = isset($showtable['Comment'])
-                ? $showtable['Comment']
-                : '';
+        $show_comment = '';
+        if (isset($showtable['Comment'])) {
+            $show_comment = $showtable['Comment'];
         }
     }
     $tbl_collation       = empty($showtable['Collation'])

phpinfo.php

@@ -10,7 +10,7 @@
  * Gets core libraries and defines some variables
  */
 require_once 'libraries/common.inc.php';
-
+PMA_Response::getInstance()->disable();
 
 /**
  * Displays PHP information

tbl_operations.php

@@ -180,7 +180,7 @@ if (isset($result) && empty($message_to_show)) {
     $_type = 'success';
     if (empty($_message)) {
         $_message = $result 
-            ? $message = PMA_Message::success(
+            ? PMA_Message::success(
                 __('Your SQL query has been executed successfully')
             )
             : PMA_Message::error(__('Error'));