From ffed6bf316b13164fd5556d6b64352058b578bc7 Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Mon, 7 Feb 2005 09:32:24 +0000 Subject: [PATCH] Better fix for 2479. This time I'm 99.999999% positive it's fixed ;) --- lib/datalib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/datalib.php b/lib/datalib.php index 1c4745ce01..77aed11611 100644 --- 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); } -- 2.39.5