MDL-9929 we need some other name for password field in course edit page

diff --git a/course/edit.php b/course/edit.php
index 9311a25eb0b6e6a9e0ef565c3dbfaee52ad986bc..85105155393afd6c30ed76fdd03e54a1aff2365e 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -60,6 +60,7 @@
     $editform = new course_edit_form('edit.php', compact('course', 'category'));
     // now override defaults if course already exists
     if (!empty($course)) {
+        $course->enrolpassword = $course->password; // we need some other name for password field MDL-9929
         $editform->set_data($course);
     }
     if ($editform->is_cancelled()){
@@ -70,7 +71,8 @@
         }
 
     } else if ($data = $editform->get_data()) {
-    
+
+        $data->password = $data->enrolpassword;  // we need some other name for password field MDL-9929
 /// process data if submitted
 
         //preprocess data

diff --git a/course/edit_form.php b/course/edit_form.php
index 21ca8a92a7e6a3406ceca61c9c3faad990c93ee7..eda1883137a79b7661cd662d34af75adbefb57f9 100644 (file)
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -277,10 +277,10 @@ class course_edit_form extends moodleform {
         $mform->setHelpButton('visible', array('courseavailability', get_string('availability')), true);
         $mform->setDefault('visible', 1);
 
-        $mform->addElement('passwordunmask', 'password', get_string('enrolmentkey'), 'size="25"');
-        $mform->setHelpButton('password', array('enrolmentkey', get_string('enrolmentkey')), true);
-        $mform->setDefault('password', '');
-        $mform->setType('password', PARAM_RAW);
+        $mform->addElement('passwordunmask', 'enrolpassword', get_string('enrolmentkey'), 'size="25"');
+        $mform->setHelpButton('enrolpassword', array('enrolmentkey', get_string('enrolmentkey')), true);
+        $mform->setDefault('enrolpassword', '');
+        $mform->setType('enrolpassword', PARAM_RAW);
 
         $choices = array();
         $choices['0'] = get_string('guestsno');