Merge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 21:58:06 +0000 (10:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 21:58:06 +0000 (10:58 +1300)
1  2 
message/index.php
message/lib.php
message/output/email/lang/en/message_email.php
message/output/email/message_output_email.php

Simple merge
diff --cc message/lib.php
Simple merge
@@@ -74,14 -70,11 +73,15 @@@ class message_output_email extends mess
  
      /**
       * Creates necessary fields in the messaging config form.
-      * @param object $mform preferences form class
+      *
+      * @param array $preferences An array of user preferences
       */
      function config_form($preferences){
 -        global $USER, $OUTPUT;
 +        global $USER, $OUTPUT, $CFG;
 +
 +        if (empty($CFG->messagingallowemailoverride)) {
 +            return null;
 +        }
  
          $inputattributes = array('size'=>'30', 'name'=>'email_email', 'value'=>$preferences->email_email);
          $string = get_string('email','message_email') . ': ' . html_writer::empty_tag('input', $inputattributes);