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

added method PMA_getHtmlForColumnCollation

Browse Source
This commit is contained in:
Spun Nakandala 2013-08-05 23:08:51 +05:30
parent d8afc1f544
commit 507ca058a4
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/tbl_columns_definition_form.inc.php
View File

@ -234,12 +234,9 @@ for ($i = 0; $i < $num_fields; $i++) {
$ci++;
// column collation
$tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
$content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
$content_cells[$i][$ci] = PMA_getHtmlForColumnCollation(
$i, $ci, $ci_offset, $row
);
unset($tmp_collation);
$ci++;
// column attribute

21
libraries/tbl_columns_definition_form.lib.php
View File

@ -957,4 +957,25 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
return $html;
}
/**
* Function to get html for column collation
*
* @param int $i field number
* @param int $ci cell index
* @param int $ci_offset cell index offset
* @param array $row row
*
* @return string
*/
function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
{
$tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
$html = PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
);
return $html;
}
?>