Fixing bug 2479. Can't figure out a way to do it with a left join at this stage but...

diff --git a/lib/datalib.php b/lib/datalib.php
index 0094ee2f3cc7080a9f2d22ed26a1d6e9e3cd52be..36d7c228e0570b1b338ff953385a67e55fb55e45 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1356,8 +1356,9 @@ function get_courses_notin_metacourse($metacourseid,$count=false) {
     else {
         $sql = "SELECT c.id,c.shortname,c.fullname";
     }
-    $sql .= " FROM {$CFG->prefix}course c LEFT  JOIN {$CFG->prefix}course_meta mc ON mc.child_course = c.id
-     WHERE (mc.parent_course IS NULL OR mc.parent_course != $metacourseid) AND c.id != $metacourseid AND c.id != $site->id AND c.metacourse != 1";
+
+    $sql .= " FROM {$CFG->prefix}course c WHERE c.id NOT IN (".implode(',',array_keys(get_courses_in_metacourse($metacourseid))).") AND c.id !=8 and c.id != 1 and c.metacourse != 1";
+
     return get_records_sql($sql);
 }