[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-32-gacbbd8f

The branch, QA_3_4 has been updated via acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit) from 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/schema/User_Schema.class.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec2549f..1746f5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search +- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 17c2d39..310ffec 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -66,7 +66,7 @@ class PMA_User_Schema $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; case 'delete_old_references': - $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); + $this->_deleteTableRows($_POST['delrow'], $cfgRelation, $db, $_POST['chpage']); break; case 'process_export': $this->_processExportSchema(); @@ -318,7 +318,7 @@ class PMA_User_Schema echo "\n" . '</form>' . "\n\n"; } // end if - $this->_deleteTables($db, $this->chosenPage, isset($tabExist)); + $this->_deleteTables($db, $this->chosenPage, $tabExist); } /** @@ -438,7 +438,7 @@ class PMA_User_Schema } if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs($db, $table) + . PMA_generate_common_hidden_inputs($db) . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') hooks/post-receive -- phpMyAdmin