From cf230d98a8861531f7fac6739aac6be980dcfc39 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Fri, 3 May 2013 14:45:23 +1000 Subject: [PATCH] MDL-39482 avoid using get_category_or_system_context() because file might not be included --- lib/coursecatlib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/coursecatlib.php b/lib/coursecatlib.php index 8902ecd2543..591b66912eb 100644 --- a/lib/coursecatlib.php +++ b/lib/coursecatlib.php @@ -1152,7 +1152,7 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate { $params = array('siteid' => SITEID); if ($recursive) { if ($this->id) { - $context = get_category_or_system_context($this->id); + $context = context_coursecat::instance($this->id); $where .= ' AND ctx.path like :path'; $params['path'] = $context->path. '/%'; } @@ -1488,7 +1488,11 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate { // can not move to itself or it's own child return false; } - return has_capability('moodle/category:manage', get_category_or_system_context($newparentcat->id)); + if ($newparentcat->id) { + return has_capability('moodle/category:manage', context_coursecat::instance($newparentcat->id)); + } else { + return has_capability('moodle/category:manage', context_system::instance()); + } } /** -- 2.36.1