From 02af4bcf4c93082557f0cfc1451e4bc393fdcdb5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 21 Jul 2012 12:58:24 -0400 Subject: [PATCH 1/3] Could not delete a relational schema page --- libraries/schema/User_Schema.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index e66645b970..d285836f75 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -57,13 +57,13 @@ class PMA_User_Schema */ public function processUserChoice() { - global $action_choose, $db, $cfgRelation; + global $db, $cfgRelation; if (isset($this->action)) { switch ($this->action) { case 'selectpage': $this->chosenPage = $_REQUEST['chpage']; - if ($action_choose=="1") { + if ('1' == $_REQUEST['action_choose']) { $this->deleteCoordinates( $db, $cfgRelation, From 865d06ff7f2a698c4bccc5acf0b1d36a7ffc09ba Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 21 Jul 2012 13:13:39 -0400 Subject: [PATCH 2/3] Could not add a table to a relational schema --- libraries/schema/User_Schema.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index d285836f75..c46f8a740e 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -856,9 +856,8 @@ class PMA_User_Schema private function _editCoordinates($db, $cfgRelation) { for ($i = 0; $i < $this->c_table_rows; $i++) { - $arrvalue = 'c_table_' . $i; - global $$arrvalue; - $arrvalue = $$arrvalue; + $arrvalue = $_POST['c_table_' . $i]; + if (! isset($arrvalue['x']) || $arrvalue['x'] == '') { $arrvalue['x'] = 0; } From 3b75241fa9061da4b3ec9949ad72a1644a24f7a3 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 21 Jul 2012 17:57:55 +0100 Subject: [PATCH 3/3] Fixed submission of Export Schema form --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index c46f8a740e..cddcdf5cbd 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -392,7 +392,7 @@ class PMA_User_Schema { global $cfg,$db,$test_rs,$chpage; ?> -
+