diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-06-05 20:03:08 +0400 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-06-05 20:03:08 +0400 |
| commit | edc0a2fdf668db37193fec35374d96fd2d16a94a (patch) | |
| tree | 0c7cd96b5c72dae06ccda4e7645544f87774da00 /libraries | |
| parent | 0375b3f848ba85de7737df8ac135555bb5b298dc (diff) | |
| parent | f16dfc898f0e34ea38c1be80714fcb476caf59fe (diff) | |
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Table.class.php | 2 | ||||
| -rw-r--r-- | libraries/relation.lib.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/Table.class.php b/libraries/Table.class.php index e263e7132b..d89314ce13 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1251,7 +1251,7 @@ class PMA_Table // Renable table in configuration storage PMA_REL_renameTable( $old_db, $new_db, - $old_table, $new_table + $old_name, $new_name ); $this->messages[] = sprintf( diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index a02e4a3b4c..3b3fad99c3 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -345,7 +345,7 @@ function PMA_printDiagMessageForParameter($parameter, echo '<tr><th class="left">'; echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\'] ... '; echo '</th><td class="right">'; - if ($GLOBALS['cfgRelation'][$relation_parameter]) { + if ($relation_parameter_set) { echo $messages['ok']; } else { printf($messages['error'], $doc_anchor); @@ -1281,7 +1281,7 @@ function PMA_REL_renameSingleTable($table, . $db_field . ' = \'' . PMA_sqlAddSlashes($source_db) . '\'' . ' AND ' . $table_field . ' = \'' . PMA_sqlAddSlashes($source_table) . '\''; - PMA_query_as_controluser($table_query); + PMA_query_as_controluser($query); } |