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-03-03 19:29:33 +01:00
commit f330e7d261
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Util.class.php
View File

@ -3983,7 +3983,7 @@ class PMA_Util
*/
public static function parseEnumSetValues($definition, $escapeHtml = true)
{
$values_string = htmlentities($definition);
$values_string = htmlentities($definition,ENT_COMPAT, "UTF-8");
// There is a JS port of the below parser in functions.js
// If you are fixing something here,
// you need to also update the JS port.

16
sql.php
View File

@ -224,18 +224,22 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
$field_info_query, null, null, null, PMA_DBI_QUERY_STORE
);
$selected_values = explode(',', $_REQUEST['curr_value']);
$values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
$select = '';
foreach ($values as $value) {
//converts characters of $_REQUEST['curr_value'] to HTML entities
$converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
$selected_values = explode (',' , $converted_curr_value);
foreach ($values as $value) {
$select .= '<option value="' . $value . '"';
if (in_array($value, $selected_values, true)) {
$select .= ' selected="selected"';
if ($value == $converted_curr_value || in_array($value , $selected_values , true)) {
$select .= ' selected ';
}
$select .= '>' . $value . '</option>';
}
}
$select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
$select = '<select multiple="multiple" size="' . $select_size . '">'