29 Sep
2011
29 Sep
'11
7:14 a.m.
The branch, master has been updated
via 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd (commit)
via 86138fa9148805a911dde6e702c7be48712cf2f7 (commit)
via acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit)
via 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit)
from 86722781ebeb5f740c778ec22c72015d9d63a414 (commit)
- Log -----------------------------------------------------------------
commit 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 29 07:12:57 2011 -0400
Fix merge conflicts
commit 86138fa9148805a911dde6e702c7be48712cf2f7
Merge: 8672278 acbbd8f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 29 07:06:48 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/schema/User_Schema.class.php | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bc7d5b1..035c8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,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 29b1bf3..26100b3 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -84,10 +84,10 @@ class PMA_User_Schema
break;
case 'delete_old_references':
$this->_deleteTableRows(
- $delrow,
+ $_POST['delrow'],
$cfgRelation,
$db,
- $this->chosenPage
+ $_POST['chpage']
);
break;
case 'process_export':
@@ -352,7 +352,9 @@ class PMA_User_Schema
echo "\n" . '</form>' . "\n\n";
} // end if
- $this->_deleteTables($db, $this->chosenPage, isset($tabExist));
+ if (isset($tabExist)) {
+ $this->_deleteTables($db, $this->chosenPage, $tabExist);
+ }
}
/**
@@ -473,7 +475,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