extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 18:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

always run fix_encoded_options to cope with customfields of type select got resorted by Firefox

Browse Source
This commit is contained in:
Ralf Becker 2015-01-12 12:53:50 +00:00
parent 4476126986
commit f15a37f368
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -231,8 +231,6 @@ class etemplate_widget_menupopup extends etemplate_widget
// typeOptions thinks # of rows is the first thing in options // typeOptions thinks # of rows is the first thing in options
($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']), ($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']),
$no_lang, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name); $no_lang, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
// need to run that here manually, automatic run through etemplate_new::exec() already happend
self::fix_encoded_options(self::$request->sel_options[$form_name]);
// if no_lang was modified, forward modification to the client // if no_lang was modified, forward modification to the client
if ($no_lang != $this->attr['no_lang']) if ($no_lang != $this->attr['no_lang'])
@ -240,6 +238,9 @@ class etemplate_widget_menupopup extends etemplate_widget
self::setElementAttribute($form_name, 'no_lang', $no_lang); self::setElementAttribute($form_name, 'no_lang', $no_lang);
} }
} }
// need to run that here manually for select-* and customfield widgets
// (automatic run through etemplate_new::exec() already happend)
self::fix_encoded_options(self::$request->sel_options[$form_name]);
// Make sure  s, etc. are properly encoded when sent, and not double-encoded // Make sure  s, etc. are properly encoded when sent, and not double-encoded
$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id); $options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
@ -290,7 +291,7 @@ class etemplate_widget_menupopup extends etemplate_widget
} }
} }
} }
if (is_null($use_array_of_objects) && is_numeric($value)) if (is_null($use_array_of_objects) && is_numeric($value) && (!is_array($label) || !isset($label['value'])))
{ {
$options = $backup_options; $options = $backup_options;
return self::fix_encoded_options($options, true); return self::fix_encoded_options($options, true);