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

Do not test repeatedly if variable is set

Browse Source
This commit is contained in:
Michal Čihař 2013-08-09 08:57:39 +02:00
parent 2a3d5c608a
commit b0a11a95bc
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libraries/tbl_columns_definition_form.lib.php
View File

@ -386,24 +386,25 @@ function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
? $_REQUEST['field_null'][$columnNumber]
: '';
if (isset($_REQUEST['field_key'][$columnNumber])
&& $_REQUEST['field_key'][$columnNumber] == 'primary_' . $columnNumber
) {
$columnMeta['Key'] = 'PRI';
} elseif (isset($_REQUEST['field_key'][$columnNumber])
&& $_REQUEST['field_key'][$columnNumber] == 'index_' . $columnNumber
) {
$columnMeta['Key'] = 'MUL';
} elseif (isset($_REQUEST['field_key'][$columnNumber])
&& $_REQUEST['field_key'][$columnNumber] == 'unique_' . $columnNumber
) {
$columnMeta['Key'] = 'UNI';
} elseif (isset($_REQUEST['field_key'][$columnNumber])
&& $_REQUEST['field_key'][$columnNumber] == 'fulltext_' . $columnNumber
) {
$columnMeta['Key'] = 'FULLTEXT';
} else {
$columnMeta['Key'] = '';
$columnMeta['Key'] = '';
if (isset($_REQUEST['field_key'][$columnNumber])) {
$parts = explode($_REQUEST['field_key'][$columnNumber], '_', 2);
if (count($parts) == 2 && $parts[1] == $columnNumber) {
switch ($parts[0]) {
case 'primary':
$columnMeta['Key'] = 'PRI';
break;
case 'index':
$columnMeta['Key'] = 'MUL';
break;
case 'unique':
$columnMeta['Key'] = 'UNI';
break;
case 'fulltext':
$columnMeta['Key'] = 'FULLTEXT';
break;
}
}
}
// put None in the drop-down for Default, when someone adds a field