removed references to /requested(teachers?|students?)name/ and 'showsiteparticipantsl...

diff --git a/admin/editor.php b/admin/editor.php
index 0057219b7027c93604457884ae740b7d58ff5cc3..9ea7917fb597342e4888834338445ff4e3034a34 100644 (file)
--- a/admin/editor.php
+++ b/admin/editor.php
@@ -178,6 +178,7 @@ function reset_to_defaults ($editor) {
 /// Reset the values to default
 
     global $CFG;
+    //TO DO: fix defaults now that lib/defaults.php is about to be removed
     include_once($CFG->dirroot .'/lib/defaults.php');
 
     $updatedata = array();

diff --git a/admin/settings/courses.php b/admin/settings/courses.php
index d1f22116c6acdf0592de83279427a5e093be3c5e..030610d65982f5f1e3908c868cb37210cdfc6e82 100644 (file)
--- a/admin/settings/courses.php
+++ b/admin/settings/courses.php
@@ -12,10 +12,6 @@ $temp = new admin_settingpage('courserequest', get_string('courserequest'));
 $temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
 require_once($CFG->dirroot.'/course/lib.php');
 $temp->add(new admin_setting_configselect('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1, make_categories_options()));
-$temp->add(new admin_setting_configtext('requestedteachername', get_string('requestedteachername', 'admin'), get_string('configrequestedteachername', 'admin'), get_string("defaultcourseteacher"), PARAM_RAW));
-$temp->add(new admin_setting_configtext('requestedteachersname', get_string('requestedteachersname', 'admin'), get_string('configrequestedteachersname', 'admin'), get_string("defaultcourseteachers"), PARAM_RAW));
-$temp->add(new admin_setting_configtext('requestedstudentname', get_string('requestedstudentname', 'admin'), get_string('configrequestedstudentname', 'admin'), get_string("defaultcoursestudent"), PARAM_RAW));
-$temp->add(new admin_setting_configtext('requestedstudentsname', get_string('requestedstudentsname', 'admin'), get_string('configrequestedstudentsname', 'admin'), get_string("defaultcoursestudents"), PARAM_RAW));
 $ADMIN->add('courses', $temp);
 
 

diff --git a/course/pending.php b/course/pending.php
index a454792b3f44bdfd67626dd66efe9dbd96b0b285..15ce7ecc60cbc734b46a58af935688f06f30ad82 100644 (file)
--- a/course/pending.php
+++ b/course/pending.php
@@ -36,21 +36,9 @@
             $teacherid = $course->requester;
             unset($course->requester);
             $course->teacher = get_string("defaultcourseteacher");
-            if (!empty($CFG->requestedteachername)) {
-                $course->teacher = $CFG->requestedteachername;
-            }
             $course->teachers = get_string("defaultcourseteachers");
-            if (!empty($CFG->requestedteachersname)) {
-                $course->teachers = $CFG->requestedteachersname;
-            }
             $course->student = get_string("defaultcoursestudent");
-            if (!empty($CFG->requestedstudentname)) {
-                $course->student = $CFG->requestedstudentname;
-            }
             $course->students = get_string("defaultcoursestudents");
-            if (!empty($CFG->requestedstudentsname)) {
-                $course->students = $CFG->requestedstudentsname;
-            }
             if (!empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor != 'none' && !empty($CFG->restrictbydefault)) {
                 $course->restrictmodules = 1;
             }

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 9197490ca59750f44461c660eba525c21d21137e..e63374903788faba70af094682f22c6d79ade91b 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2216,6 +2216,14 @@ function main_upgrade($oldversion=0) {
         table_column('course','','defaultrole','integer','10', 'unsigned', '0', 'not null');
     }
 
+    if ($oldversion < 2006091800) {
+        delete_records('config', 'name', 'showsiteparticipantslist');
+        delete_records('config', 'name', 'requestedteachername');
+        delete_records('config', 'name', 'requestedteachersname');
+        delete_records('config', 'name', 'requestedstudentname');
+        delete_records('config', 'name', 'requestedstudentsname');
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 5cc1e1bd194abaa7b33bccd92056269c9f2eab4b..4846cf5cebf5ff81bcd4e228dba5af7a0646045a 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1816,6 +1816,14 @@ function main_upgrade($oldversion=0) {
         table_column('course','','defaultrole','integer','10', 'unsigned', '0', 'not null');
     }
 
+    if ($oldversion < 2006091800) {
+        delete_records('config', 'name', 'showsiteparticipantslist');
+        delete_records('config', 'name', 'requestedteachername');
+        delete_records('config', 'name', 'requestedteachersname');
+        delete_records('config', 'name', 'requestedstudentname');
+        delete_records('config', 'name', 'requestedstudentsname');
+    }
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index 3797ebc688a4e7c8c38b37c5c2aca93ee308d179..66f810ec73d76768c85b241ce85ab79467ef5214 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006091702;  // YYYYMMDD = date
+   $version = 2006091800;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name