MDL-17966 reverting previous commit, solution proposed in tracker

diff --git a/lib/adminlib.php b/lib/adminlib.php
index a4b6fc56b8007c7e1fa708c6c9d806252820b557..3edc845cc50070f6862ccd71d54598a110ad61ab 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4269,11 +4269,7 @@ function admin_write_settings($formdata) {
             $adminroot->errors[$fullname]->id    = $setting->get_id();
             $adminroot->errors[$fullname]->error = $error;
         }
-        // $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])) {
+        if ($original !== serialize($setting->get_setting())) {
             $count++;
             $callbackfunction = $setting->updatedcallback;
             if (function_exists($callbackfunction)) {