Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle

This commit is contained in:
Andrew Nicols
2016-11-22 09:06:09 +08:00
6 changed files with 62 additions and 16 deletions
@@ -26,6 +26,7 @@ namespace core_message\output\messagearea;
defined('MOODLE_INTERNAL') || die();
use core_message\api;
use renderable;
use templatable;
@@ -95,6 +96,8 @@ class messages implements templatable, renderable {
$data->messages[] = $message->export_for_template($output);
}
$data->isblocked = api::is_user_blocked($this->currentuserid, $this->otheruserid);
return $data;
}
}