Merge branch 'MDL-32570-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

This commit is contained in:
Damyon Wiese 2013-10-08 13:46:42 +08:00
commit 786538f74f

View file

@ -411,10 +411,10 @@ function process_group_tag($tagcontents) {
} else {
// If not found and not allowed to create, stick with default
$this->log_line('Category '.$group->category.' not found in Moodle database, so using default category instead.');
$course->category = 1;
$course->category = $this->get_default_category_id();
}
} else {
$course->category = 1;
$course->category = $this->get_default_category_id();
}
$course->timecreated = time();
$course->startdate = time();
@ -809,6 +809,24 @@ function load_role_mappings() {
return false;
}
/**
* Get the default category id (often known as 'Miscellaneous'),
* statically cached to avoid multiple DB lookups on big imports.
*
* @return int id of default category.
*/
private function get_default_category_id() {
static $defaultcategoryid = null;
if ($defaultcategoryid === null) {
$category = get_course_category();
$defaultcategoryid = $category->id;
}
return $defaultcategoryid;
}
} // end of class