Merge pull request #13019 from jublonet/hotfix/13010-pmadb-relation-replaceinto

Copy database: Fix SQL error for copying PMADB metadata
This commit is contained in:
Michal Čihař 2017-02-20 08:38:54 +01:00 committed by GitHub
commit 4591c24b45
2 changed files with 3 additions and 3 deletions

View File

@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
- issue #11231 Try harder to honor LoginCookieValidity setting
- issue #13016 and #13017 Slight improvements to the table layout of Relation view
- issue #12345 Correctly show affected rows for LOAD DATA queries
- 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'

View File

@ -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(