gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-08-14 23:05:12 +02:00
commit 09ee663d21
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libraries/structure.lib.php
View File

@ -2577,4 +2577,41 @@ function PMA_getReservedWordColumnNameMessages($db ,$table)
}
return $messages;
}
/**
* Function to get the type of command for multiple field handling
*
* @return string
*/
function PMA_getMultipleFieldCommandType()
{
$submit_mult = null;
if (isset($_REQUEST['submit_mult_change_x'])) {
$submit_mult = 'change';
} elseif (isset($_REQUEST['submit_mult_drop_x'])) {
$submit_mult = 'drop';
} elseif (isset($_REQUEST['submit_mult_primary_x'])) {
$submit_mult = 'primary';
} elseif (isset($_REQUEST['submit_mult_index_x'])) {
$submit_mult = 'index';
} elseif (isset($_REQUEST['submit_mult_unique_x'])) {
$submit_mult = 'unique';
} elseif (isset($_REQUEST['submit_mult_spatial_x'])) {
$submit_mult = 'spatial';
} elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
$submit_mult = 'ftext';
} elseif (isset($_REQUEST['submit_mult_browse_x'])) {
$submit_mult = 'browse';
} elseif (isset($_REQUEST['submit_mult'])) {
$submit_mult = $_REQUEST['submit_mult'];
} elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) {
$submit_mult = 'row_delete';
if (isset($_REQUEST['selected'])) {
$_REQUEST['selected_fld'] = $_REQUEST['selected'];
}
}
return $submit_mult;
}
?>

26
tbl_structure.php
View File

@ -64,30 +64,8 @@ if (isset($_REQUEST['do_save_data'])) {
*
* submit_mult_*_x comes from IE if <input type="img" ...> is used
*/
if (isset($_REQUEST['submit_mult_change_x'])) {
$submit_mult = 'change';
} elseif (isset($_REQUEST['submit_mult_drop_x'])) {
$submit_mult = 'drop';
} elseif (isset($_REQUEST['submit_mult_primary_x'])) {
$submit_mult = 'primary';
} elseif (isset($_REQUEST['submit_mult_index_x'])) {
$submit_mult = 'index';
} elseif (isset($_REQUEST['submit_mult_unique_x'])) {
$submit_mult = 'unique';
} elseif (isset($_REQUEST['submit_mult_spatial_x'])) {
$submit_mult = 'spatial';
} elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
$submit_mult = 'ftext';
} elseif (isset($_REQUEST['submit_mult_browse_x'])) {
$submit_mult = 'browse';
} elseif (isset($_REQUEST['submit_mult'])) {
$submit_mult = $_REQUEST['submit_mult'];
} elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) {
$submit_mult = 'row_delete';
if (isset($_REQUEST['selected'])) {
$_REQUEST['selected_fld'] = $_REQUEST['selected'];
}
}
$submit_mult = PMA_getMultipleFieldCommandType();
if (! empty($submit_mult)) {
if (isset($_REQUEST['selected_fld'])) {
$err_url = 'tbl_structure.php?' . PMA_URL_getCommon($db, $table);