More changes from disabledIf() to freeze().

Moved set_defaults() into edit.php

diff --git a/user/edit.php b/user/edit.php
index 8dbfca0a7bd1ac04df199303bedb1429133da4c3..8471c37ea609bb2dbf5a11f13eeb78d75a537128 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -78,8 +78,9 @@
     }
 
 
-    $userform = new user_edit_form(null, compact('user','course', 'authplugin'));
+    $userform = new user_edit_form(null, compact('user','course','authplugin'));
     $userform->set_upload_manager(new upload_manager('imagefile',false,false,null,false,0,true,true));
+    $userform->set_defaults($user);
 
 /// If data submitted, then process and store.
     if ($usernew = $userform->data_submitted()) {

diff --git a/user/edit_form.php b/user/edit_form.php
index a386108953b39b2306ab175048ac1cea4bb009b0..7e13dc50133e0da05ed2dd0a630efe7cb79e78ee 100644 (file)
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -168,7 +168,9 @@ class user_edit_form extends moodleform {
         $mform->addElement('select', 'ajax', get_string('ajaxuse'), $choices);
         $mform->setType('ajax', PARAM_INT);
         $mform->setDefault('ajax', 1);
-        $mform->disabledIf('ajax', empty($CFG->enableajax), true);
+        if (empty($CFG->enableajax)) {
+            $mform->freeze('ajax');
+        }
         
         $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
         $mform->setType('city', PARAM_MULTILANG);
@@ -268,7 +270,9 @@ class user_edit_form extends moodleform {
         
         $mform->addElement('text', 'idnumber', get_string('idnumber'), 'maxlength="64" size="25"');
         $mform->setType('idnumber', PARAM_MULTILANG);
-        $mform->disabledIf('idnumber', (!$userupdate), true);
+        if (!$userupdate) {
+            $mform->freeze('idnumber');
+        }
 
         if ($userupdate) {
             $mform->addElement('text', 'institution', get_string('institution'), 'maxlength="40" size="25"');
@@ -280,19 +284,21 @@ class user_edit_form extends moodleform {
         
         $mform->addElement('text', 'phone1', get_string('phone'), 'maxlength="20" size="25"');
         $mform->setType('phone1', PARAM_CLEAN);
-        $mform->disabledIf('phone1', (!$userupdate), true);
+        if (!$userupdate) {
+            $mform->freeze('phone1');
+        }
         
         $mform->addElement('text', 'phone2', get_string('phone'), 'maxlength="20" size="25"');
         $mform->setType('phone2', PARAM_CLEAN);
-        $mform->disabledIf('phone2', (!$userupdate), true);
+        if (!$userupdate) {
+            $mform->freeze('phone2');
+        }
         
         $mform->addElement('text', 'address', get_string('address'), 'maxlength="70" size="25"');
         $mform->setType('address', PARAM_MULTILANG);
-        $mform->disabledIf('address', (!$userupdate), true);
-
-
-        /// override the defaults with the user settings
-        $this->set_defaults($user);
+        if (!$userupdate) {
+            $mform->freeze('address');
+        }
 
 
         /// disable fields that are locked by auth plugins