Merged from MOODLE_14_STABLE: Changes to calls to get_courses to not get all fields

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index aebe3efa40ddfc895dc64e4176e1fe2ee82ccdfc..53f20a089d199f2f4dd0ecf88a54f25fdfd4ba4b 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -174,7 +174,7 @@
                 $addgroup[2] = $user->group3;
                 $addgroup[3] = $user->group4;
                 $addgroup[4] = $user->group5;
-                $courses = get_courses("all");
+                $courses = get_courses("all",'c.sortorder','c.id,c.shortname,c.fullname,c.sortorder');
                 for ($i=0; $i<5; $i++) {
                     $courseid[$i]=0;
                 }

diff --git a/backup/backup.php b/backup/backup.php
index 8ccdf1adbe00a115a67d2f276a6f917ce25a7367..fb3efb91186a2de3754222a867796e6c9a62cb0f 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -49,7 +49,7 @@
         print_header("$site->shortname: $strcoursebackup", $site->fullname,
                      "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> $strcoursebackup");
 
-        if ($courses = get_courses()) {
+        if ($courses = get_courses('all','c.shortname','c.id,c.shortname,c.fullname')) {
             print_heading(get_string("choosecourse"));
             print_simple_box_start("center");
             foreach ($courses as $course) {

diff --git a/backup/restore_check.html b/backup/restore_check.html
index 05f04b4324afacb03b8d99688386a3e783cc0668..879a8d57ca5ec1e44d30e3a9cfb0bdcc269a32e7 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -148,7 +148,7 @@
 
     //Now, select the course if needed
     if (($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id == 0) and (iscreator())) {
-        if ($courses = get_courses("all","c.fullname")) {
+        if ($courses = get_courses("all","c.fullname","c.id,c.fullname,c.shortname")) {
             print_heading(get_string("choosecourse"));
             print_simple_box_start("center");
             foreach ($courses as $course) {

diff --git a/calendar/view.php b/calendar/view.php
index 1fb3d57f8107e8cd8628d231aaa072d7b9f64101..97c77a09ef5c9efc067ab0cb326e5638ac1b026b 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -606,7 +606,7 @@ function calendar_course_filter_selector($getvars = '') {
     }
 
     if (isadmin()) {
-        $courses = get_courses('all', 'c.shortname');
+        $courses = get_courses('all', 'c.shortname','c.id,c.shortname');
     } else {
         $courses = get_my_courses($USER->id, 'shortname');
     }