Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis...

diff --git a/message/lib.php b/message/lib.php
index c71f62c..5035226 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -2035,26 +2035,6 @@ function message_post_message($userfrom, $userto, $message, $format) {
     return message_send($eventdata);
 }
 
-
-/**
- * Returns a list of all user ids who have used messaging in the site
- * This was the simple way to code the SQL ... is it going to blow up
- * on large datasets?
- *
- * @deprecated To be deleted in 2.2 MDL-31709
- * @return array
- */
-function message_get_participants() {
-    global $CFG, $DB;
-
-        return $DB->get_records_sql("SELECT useridfrom as id,1 FROM {message}
-                               UNION SELECT useridto as id,1 FROM {message}
-                               UNION SELECT useridfrom as id,1 FROM {message_read}
-                               UNION SELECT useridto as id,1 FROM {message_read}
-                               UNION SELECT userid as id,1 FROM {message_contacts}
-                               UNION SELECT contactid as id,1 from {message_contacts}");
-}
-
 /**
  * Print a row of contactlist displaying user picture, messages waiting and
  * block links etc