Merge branch 'QA_4_7'

phpmyadmin · Feb 6, 2017 · ebfc869 · ebfc869
2 parents 3cfe349 + f73a98e
commit ebfc869
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
 - issue #12941 Fixed sorting of tables in relation view
 - issue #12936 Fixed tables pagination in navigation panel
 - issue #12904 Do not collapse add form for central columns if there are none
+- issue #12955 Fixed database renaming
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

diff --git a/db_operations.php b/db_operations.php
@@ -37,7 +37,7 @@
 /**
  * Rename/move or copy database
  */
-if (strlen($GLOBALS['db'] > 0)
+if (strlen($GLOBALS['db']) > 0
     && (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_copy']))
 ) {
     if (! empty($_REQUEST['db_rename'])) {