Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Atul Pratap Singh 2012-07-21 23:52:38 +05:30
commit 4b47c6d2cb

View File

@ -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,
@ -392,7 +392,7 @@ class PMA_User_Schema
{
global $cfg,$db,$test_rs,$chpage;
?>
<form method="post" action="schema_export.php">
<form class="disableAjax" method="post" action="schema_export.php">
<fieldset>
<legend>
<?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;
}