From c4654d24dfb1521db507092c1bf722dc4d90449c Mon Sep 17 00:00:00 2001 From: Joshua Atkins Date: Sun, 19 Feb 2017 22:33:42 +0100 Subject: [PATCH] Copy db: Fix SQL error for copying PMADB metadata Fixes #13010. Signed-off-by: Joshua Atkins --- ChangeLog | 1 + libraries/Table.php | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3b1633209..bf12f1be90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ phpMyAdmin - ChangeLog - issue #12693 Improved support for TokuDB - issue #11231 Try harder to honor LoginCookieValidity setting - issue #13016 and #13017 Slight improvements to the table layout of Relation view +- issue #13010 Copy database: SQL error for copying PMADB metadata 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/Table.php b/libraries/Table.php index 6913bb4886..6d126358ba 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -1124,12 +1124,11 @@ class Table . ') ' . ' VALUES(' . '\'' . $GLOBALS['dbi']->escapeString($target_db) . '\',\'' . $GLOBALS['dbi']->escapeString($target_table) . '\',\'' . $GLOBALS['dbi']->escapeString($comments_copy_row['column_name']) + . '\',\'' . $GLOBALS['dbi']->escapeString($target_table) . '\',\'' + . $GLOBALS['dbi']->escapeString($comments_copy_row['comment']) . '\'' . ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . $GLOBALS['dbi']->escapeString( - $comments_copy_row['comment'] - ) - . '\',' . '\'' . $GLOBALS['dbi']->escapeString( $comments_copy_row['mimetype'] ) . '\',' . '\'' . $GLOBALS['dbi']->escapeString(