Merged AJAX GUI fixes from stable

diff --git a/user/edit.html b/user/edit.html
index 887b296a7eea017fa53ed2aea89a21868a637bc6..6bf6efa9406d56168144e3478d78e48dbe501e24 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -202,6 +202,9 @@ if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SI
     unset($choices);
     $choices["0"] = get_string("ajaxno");
     $choices["1"] = get_string("ajaxyes");
+    if (empty($CFG->enableajax)) {
+        $user->ajax = 0;
+    }
     choose_from_menu ($choices, 'ajax', $user->ajax, '', '', 0, false, empty($CFG->enableajax)) ?>
     </td>
 </tr>

diff --git a/user/edit.php b/user/edit.php
index e2e9d1ac8813229e9e1a7d0bdc37bc82db76670b..918532854823c8c0ff3215750619d986275e138f 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -114,6 +114,10 @@
         } else {
             unset_user_preference('mailcharset', $user->id);
         }
+        if (empty($CFG->enableajax)) {
+            unset($usernew->ajax);
+        }
+
         $usernew->maildigest    = clean_param($usernew->maildigest,    PARAM_INT);
         $usernew->autosubscribe = clean_param($usernew->autosubscribe, PARAM_INT);
         if (!empty($CFG->htmleditor)) {