moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Browse source 
Conflicts:
	course/lib.php
This commit is contained in:
Sam Hemelryk 2013-08-21 12:08:46 +12:00
commit 6eee89bc8f
191 changed files with 280 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/adminlib.php
View file

@ -3578,7 +3578,7 @@ class admin_setting_sitesetselect extends admin_setting_configselect {
* @return string empty or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
if (!in_array($data, array_keys($this->choices))) {
return get_string('errorsetting', 'admin');
}
@ -3589,17 +3589,16 @@ class admin_setting_sitesetselect extends admin_setting_configselect {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3781,22 +3780,21 @@ class admin_setting_sitesetcheckbox extends admin_setting_configcheckbox {
* @return string empty string or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
$record = new stdClass();
$record->id = $SITE->id;
$record->{$this->name} = ($data == '1' ? 1 : 0);
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3843,7 +3841,7 @@ class admin_setting_sitesettext extends admin_setting_configtext {
* @return string empty or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
$data = trim($data);
$validated = $this->validate($data);
if ($validated !== true) {
@ -3856,15 +3854,14 @@ class admin_setting_sitesettext extends admin_setting_configtext {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3907,7 +3904,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);