Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle

This commit is contained in:
David Monllao 2015-08-24 15:40:10 +08:00
commit 1e5b562ac9

View File

@ -31,7 +31,9 @@ class block_messages extends block_base {
global $USER, $CFG, $DB, $OUTPUT;
if (!$CFG->messaging) {
$this->content = new stdClass;
$this->content->text = '';
$this->content->footer = '';
if ($this->page->user_is_editing()) {
$this->content->text = get_string('disabled', 'message');
}