L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "MDL-39876 update_course_record function to update global COURSE"

Browse Source 
This reverts commit c290ac5510.

Conflicts:
	course/lib.php
This commit is contained in:
Sam Hemelryk
2013-08-21 15:21:06 +12:00
parent c3f5f4ab37
commit 487caf6b65
9 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+13 -10
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 $SITE, $COURSE;
global $DB, $SITE, $COURSE;
if (!in_array($data, array_keys($this->choices))) {
return get_string('errorsetting', 'admin');
}
@@ -3589,16 +3589,17 @@ class admin_setting_sitesetselect extends admin_setting_configselect {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
update_course_record($record);
$DB->update_record('course', $record);
// Reset caches.
$SITE = get_course($SITE->id);
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@@ -3780,21 +3781,22 @@ class admin_setting_sitesetcheckbox extends admin_setting_configcheckbox {
* @return string empty string or error message
*/
public function write_setting($data) {
global $SITE, $COURSE;
global $DB, $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);
update_course_record($record);
$DB->update_record('course', $record);
// Reset caches.
$SITE = get_course($SITE->id);
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@@ -3841,7 +3843,7 @@ class admin_setting_sitesettext extends admin_setting_configtext {
* @return string empty or error message
*/
public function write_setting($data) {
global $SITE, $COURSE;
global $DB, $SITE, $COURSE;
$data = trim($data);
$validated = $this->validate($data);
if ($validated !== true) {
@@ -3854,14 +3856,15 @@ class admin_setting_sitesettext extends admin_setting_configtext {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
update_course_record($record);
$DB->update_record('course', $record);
// Reset caches.
$SITE = get_course($SITE->id);
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@@ -3904,7 +3907,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
update_course_record($record);
$DB->update_record('course', $record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);