mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-11-18 16:48:27 +13:00
commit 2f365ee4aa
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
user/profile/field/menu/field.class.php
View File

@ -59,12 +59,16 @@ class profile_field_menu extends profile_field_base {
$this->options[''] = get_string('choose').'...'; $this->options[''] = get_string('choose').'...';
} }
foreach ($options as $key => $option) { foreach ($options as $key => $option) {
$this->options[$key] = format_string($option); // Multilang formatting. $this->options[$option] = format_string($option); // Multilang formatting with filters.
} }
// Set the data key. // Set the data key.
if ($this->data !== null) { if ($this->data !== null) {
$this->datakey = (int)array_search($this->data, $this->options); $key = $this->data;
if (isset($this->options[$key]) || ($key = array_search($key, $this->options)) !== false) {
$this->data = $key;
$this->datakey = $key;
}
} }
} }
@ -83,8 +87,9 @@ class profile_field_menu extends profile_field_base {
* @param moodleform $mform Moodle form instance * @param moodleform $mform Moodle form instance
*/ */
public function edit_field_set_default($mform) { public function edit_field_set_default($mform) {
if (false !== array_search($this->field->defaultdata, $this->options)) { $key = $this->field->defaultdata;
$defaultkey = (int)array_search($this->field->defaultdata, $this->options); if (isset($this->options[$key]) || ($key = array_search($key, $this->options)) !== false){
$defaultkey = $key;
} else { } else {
$defaultkey = ''; $defaultkey = '';
} }
@ -102,7 +107,7 @@ class profile_field_menu extends profile_field_base {
* @return mixed Data or null * @return mixed Data or null
*/ */
public function edit_save_data_preprocess($data, $datarecord) { public function edit_save_data_preprocess($data, $datarecord) {
return isset($this->options[$data]) ? $this->options[$data] : null; return isset($this->options[$data]) ? $data : null;
} }
/** /**
@ -127,7 +132,7 @@ class profile_field_menu extends profile_field_base {
} }
if ($this->is_locked() and !has_capability('moodle/user:update', context_system::instance())) { if ($this->is_locked() and !has_capability('moodle/user:update', context_system::instance())) {
$mform->hardFreeze($this->inputname); $mform->hardFreeze($this->inputname);
$mform->setConstant($this->inputname, $this->datakey); $mform->setConstant($this->inputname, format_string($this->datakey));
} }
} }
/** /**
@ -137,7 +142,11 @@ class profile_field_menu extends profile_field_base {
* @return int options key for the menu * @return int options key for the menu
*/ */
public function convert_external_data($value) { public function convert_external_data($value) {
$retval = array_search($value, $this->options); if (isset($this->options[$value])) {
$retval = $value;
} else {
$retval = array_search($value, $this->options);
}
// If value is not found in options then return null, so that it can be handled // If value is not found in options then return null, so that it can be handled
// later by edit_save_data_preprocess. // later by edit_save_data_preprocess.