Moved fix_category_courses to datalib.php so it's more accessible

diff --git a/course/lib.php b/course/lib.php
index 4075ba2957bbaa515913798e4d740af480085401..a505ae5636b12d085ce43bcd8b5391173364820e 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -827,48 +827,6 @@ function make_categories_list(&$list, &$parents, $category=NULL, $path="") {
 }
 
 
-function fix_category_courses($categoryid) {
-/// Given a category, this function makes sure the courseorder 
-/// variable reflects the real world.
-
-    if (!$category = get_record("course_categories", "id", $categoryid)) {
-        return false;
-    }
-
-    $catcourseschanged = false;
-
-    if (trim($category->courseorder)) {
-        $catcourses = explode(',', $category->courseorder);
-    } else {
-        $catcourses = array();
-    }
-    $courses = get_records("course", "category", $category->id);
-
-    if ($catcourses) {
-        foreach ($catcourses as $key => $catcourse) {  // Look for missing courses
-            if (!isset($courses[$catcourse])) {
-                $catcourseschanged = true;
-                unset($catcourses[$key]);
-            }
-        }
-    }
-    if ($courses) {
-        foreach ($courses as $course) {
-            if (!in_array($course->id, $catcourses)) {
-                $catcourseschanged = true;
-                $catcourses[] = $course->id;
-            }
-        }
-    }
-    if ($catcourseschanged) {
-        $category->courseorder = implode(',', $catcourses);
-        return set_field("course_categories", "courseorder", $category->courseorder, "id", $category->id);
-    }
-    return true;
-}
-
-
-
 function print_whole_category_list($category=NULL, $displaylist=NULL, $parentslist=NULL, $depth=-1) {
 /// Recursive function to print out all the categories in a nice format 
 /// with or without courses included

diff --git a/lib/datalib.php b/lib/datalib.php
index 06e5d1692760e1a55b80edbfcf5314bc8c775f09..cd7917dc6bf264c185c4766e23a00e5e40b38230 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -889,6 +889,46 @@ function get_categories($parent="none", $sort="sortorder ASC") {
     return $categories;
 }
 
+function fix_category_courses($categoryid) {
+/// Given a category, this function makes sure the courseorder 
+/// variable reflects the real world.
+
+    if (!$category = get_record("course_categories", "id", $categoryid)) {
+        return false;
+    }
+
+    $catcourseschanged = false;
+
+    if (trim($category->courseorder)) {
+        $catcourses = explode(',', $category->courseorder);
+    } else {
+        $catcourses = array();
+    }
+    $courses = get_records("course", "category", $category->id);
+
+    if ($catcourses) {
+        foreach ($catcourses as $key => $catcourse) {  // Look for missing courses
+            if (!isset($courses[$catcourse])) {
+                $catcourseschanged = true;
+                unset($catcourses[$key]);
+            }
+        }
+    }
+    if ($courses) {
+        foreach ($courses as $course) {
+            if (!in_array($course->id, $catcourses)) {
+                $catcourseschanged = true;
+                $catcourses[] = $course->id;
+            }
+        }
+    }
+    if ($catcourseschanged) {
+        $category->courseorder = implode(',', $catcourses);
+        return set_field("course_categories", "courseorder", $category->courseorder, "id", $category->id);
+    }
+    return true;
+}
+
 
 function get_guest() {
     return get_user_info_from_db("username", "guest");