diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d3dbb510ea..6846decd6c 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -780,10 +780,7 @@ class PMA_Table /* Try moving table directly */ if ($move && $what == 'data') { $tbl = new PMA_Table($source_table, $source_db); - $result = $tbl->rename( - $target_table, $target_db, - PMA_Table::isView($source_db, $source_table) - ); + $result = $tbl->rename($target_table, $target_db); if ($result) { $GLOBALS['message'] = $tbl->getLastMessage(); return true; @@ -1296,13 +1293,10 @@ class PMA_Table * * @param string $new_name new table name * @param string $new_db new database name - * @param bool $is_view is this for a VIEW rename? - * - * @todo remove the $is_view parameter (also in callers) * * @return bool success */ - function rename($new_name, $new_db = null, $is_view = false) + function rename($new_name, $new_db = null) { if (null !== $new_db && $new_db !== $this->getDbName()) { // Ensure the target is valid diff --git a/view_operations.php b/view_operations.php index 2f2ab4c1ac..700610fe56 100644 --- a/view_operations.php +++ b/view_operations.php @@ -34,7 +34,7 @@ if (isset($_REQUEST['submitoptions'])) { $warning_messages = array(); if (isset($_REQUEST['new_name'])) { - if ($pma_table->rename($_REQUEST['new_name'], null, $is_view = true)) { + if ($pma_table->rename($_REQUEST['new_name'])) { $_message .= $pma_table->getLastMessage(); $result = true; $GLOBALS['table'] = $pma_table->getName();