"ADMINLIB/MDL-17966, display changes saved in admin page, merged from 1.9"

This commit is contained in:
dongsheng 2009-03-11 02:42:28 +00:00
parent c19df282a6
commit 7719860b60

View File

@ -2427,7 +2427,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
$record->id = SITEID;
$record->{$this->name} = $data;
$record->timemodified = time();
return($DB->update_record('course', $record) ? '' : get_string('errorsetting', 'admin'));
return ($DB->update_record('course', $record) ? '' : get_string('errorsetting', 'admin'));
}
public function output_html($data, $query='') {
@ -4269,7 +4269,11 @@ function admin_write_settings($formdata) {
$adminroot->errors[$fullname]->id = $setting->get_id();
$adminroot->errors[$fullname]->error = $error;
}
if ($original !== serialize($setting->get_setting())) {
// $SITE didn't update synchronously, and we shouldn't
// update in this loop (expensive to do this). $SITE will
// be updated at the end of this function, see MDL-17966
// if ($original !== serialize($setting->get_setting())) {
if ($original !== serialize($data[$fullname])) {
$count++;
$callbackfunction = $setting->updatedcallback;
if (function_exists($callbackfunction)) {