mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 09:23:09 +02:00
Code Issues Projects Releases Wiki Activity

removed references to /requested(teachers?|students?)name/ and 'showsiteparticipantslist' - we are now using only default names stored in langpacks for backwards compatibility

Browse Source
This commit is contained in:
skodak 2006-09-18 11:21:24 +00:00
parent 102d890c14
commit dca1937c02
6 changed files with 18 additions and 17 deletions

1
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();

4
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);

12
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;
}

8
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;
}

8
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;
}

2
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