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

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 89852600e2dd26aeac42259ba2ac1bd38d2ee578..a4b6fc56b8007c7e1fa708c6c9d806252820b557 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -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)) {