Merge branch 'MDL-58754-31' of git://github.com/andrewnicols/moodle i…

…nto MOODLE_31_STABLE
moodle · May 3, 2017 · 2588195 · 2588195
2 parents 315214f + 6adcb47
commit 2588195
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/competency/classes/competency.php b/competency/classes/competency.php
@@ -676,7 +676,8 @@ protected function validate_scaleconfiguration($value) {
     public static function share_same_framework(array $ids) {
         global $DB;
         list($insql, $params) = $DB->get_in_or_equal($ids);
-        return $DB->count_records_select(self::TABLE, "id $insql", $params, "COUNT(DISTINCT(competencyframeworkid))") == 1;
+        $sql = "SELECT COUNT('x') FROM (SELECT DISTINCT(competencyframeworkid) FROM {" . self::TABLE . "} WHERE id {$insql}) f";
+        return $DB->count_records_sql($sql, $params) == 1;
     }
 
     /**