Better fix for 2479. This time I'm 99.999999% positive it's fixed ;)

diff --git a/lib/datalib.php b/lib/datalib.php
index 1c4745ce011d8b0e4e562f0d706fe51f287e23bc..77aed116115928dd9e378d961b98e0f1efdf7008 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1357,7 +1357,9 @@ function get_courses_notin_metacourse($metacourseid,$count=false) {
         $sql = "SELECT c.id,c.shortname,c.fullname";
     }
 
-    $sql .= " FROM {$CFG->prefix}course c WHERE c.id NOT IN (".implode(',',array_keys(get_courses_in_metacourse($metacourseid))).") AND c.id !=$metacourseid and c.id != $site->id and c.metacourse != 1";
+    $alreadycourses = get_courses_in_metacourse($metacourseid);
+    
+    $sql .= " FROM {$CFG->prefix}course c WHERE ".((!empty($alreadycourses)) ? "c.id NOT IN (".implode(',',array_keys($alreadycourses)).") AND " : "")." c.id !=$metacourseid and c.id != $site->id and c.metacourse != 1";
 
     return get_records_sql($sql);
 }