Merge from MOODLE_14_STABLE: moodle--eduforge--1.3.3--patch-201 - optimized calls...

diff --git a/course/category.php b/course/category.php
index 4a5e1c46cbb580f0e23e7829eb81baa487c5cabe..4f1c13b006b19404d21244dde7e4cd6120a225e7 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -168,7 +168,7 @@
             $movecourse = NULL;
             $swapcourse = NULL;
 
-            $courses = get_courses($category->id);
+            $courses = get_courses($category->id,'c.sortorder ASC', 'c.id,c.sortorder');
 
             if (isset($moveup)) {
                 if ($movecourse = get_record("course", "id", $moveup)) {

diff --git a/course/index.php b/course/index.php
index 085a50cbd96293527aa0a7045eb11cc1d2ec1e90..3a6f3a315f39133283a0d2b66b5a68b4d5bdc573 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -245,7 +245,7 @@
     }
 
 /// Find any orphan courses that don't yet have a valid category and set to default
-    if ($courses = get_courses()) {
+    if ($courses = get_courses(NULL,NULL,'c.category,c.id,c.sortorder')) {
         foreach ($courses as $course) {
             if ($course->category and !isset($categories[$course->category])) {
                 set_field("course", "category", $default, "id", $course->id);

diff --git a/course/lib.php b/course/lib.php
index a29ccde8e8e39cbf182d8626640416ac99755b37..af3f705043b6ed298d0883974717d39ae5e5ad5f 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1149,7 +1149,7 @@ function print_category_info($category, $depth) {
     echo "\n\n".'<table border="0" cellpadding="3" cellspacing="0" width="100%">';
 
     if ($CFG->frontpage == FRONTPAGECOURSELIST) {
-        $courses = get_courses($category->id);
+        $courses = get_courses($category->id, NULL, 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary');
 
         echo "<tr>";
 
@@ -1224,14 +1224,14 @@ function print_courses($category, $width="100%") {
         $categories = get_categories(0);  // Parent = 0   ie top-level categories only
         if (count($categories) == 1) {
             $category   = array_shift($categories);
-            $courses    = get_courses($category->id);
+            $courses    = get_courses($category->id, NULL, 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary');
         } else {
-            $courses    = get_courses("all");
+            $courses    = get_courses("all", NULL, 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary');
         }
         unset($categories);
     } else {
         $categories = get_categories($category->id);  // sub categories
-        $courses    = get_courses($category->id);
+        $courses    = get_courses($category->id, NULL, 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary');
     }
 
     if ($courses) {