Merged MDL-13541 from 1.9

diff --git a/course/category.php b/course/category.php
index c4a1129f47125446f2e1c103ae6f97797b2b02bd..7cac89ee24adc261a957a7c88bec2b620f526986 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -19,14 +19,20 @@
     $resort       = optional_param('resort', 0, PARAM_BOOL);
     $categorytheme= optional_param('categorytheme', false, PARAM_CLEAN);
 
+    if ($CFG->forcelogin) {
+        require_login();
+    }
+
     if (!$site = get_site()) {
         error("Site isn't defined!");
     }
 
-    $context = get_context_instance(CONTEXT_COURSECAT, $id);
+    if (empty($id)) {
+        error("Category not known!");
+    }
 
-    if ($CFG->forcelogin) {
-        require_login();
+    if (!$context = get_context_instance(CONTEXT_COURSECAT, $id)) {
+        error("Category not known!");
     }
 
     if (!$category = get_record("course_categories", "id", $id)) {