merged fix for MDL-10112 bulk messaging fails silently when messaging not enabled

diff --git a/user/index.php b/user/index.php
index 4be269224d70b8f3df93c978893e4d7013fb301c..f195321d272b28ef372c1326a50d57f62b91208c 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -594,7 +594,7 @@
         echo '<input type="button" onclick="checknone()" value="'.get_string('deselectall').'" /> ';
         $displaylist = array();
         // fix for MDL-8885, only show this if user has capability
-        if (has_capability('moodle/site:readallmessages', $context)) {
+        if (has_capability('moodle/site:readallmessages', $context) && !empty($CFG->messaging)) {
             $displaylist['messageselect.php'] = get_string('messageselectadd');
         }
         

diff --git a/user/messageselect.php b/user/messageselect.php
index 505849262c9c03e4d4c812c49d833693fa11296a..a748189e004c10c774f8b1feb83a705e1487f985 100644 (file)
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -18,6 +18,11 @@
 
     require_login();
     require_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_COURSE, $id));
+    
+    // fix for MDL-10112
+    if (empty($CFG->messaging)) {
+        error("Messaging is disabled on this site");  
+    }
 
     if (empty($SESSION->emailto)) {
         $SESSION->emailto = array();