Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle

diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php
index 220515f..a051f93 100644 (file)
--- a/message/output/popup/lib.php
+++ b/message/output/popup/lib.php
@@ -35,7 +35,8 @@ function message_popup_render_navbar_output(\renderer_base $renderer) {
 
     // Early bail out conditions.
     if (!isloggedin() || isguestuser() || user_not_fully_set_up($USER) ||
-        get_user_preferences('auth_forcepasswordchange')) {
+        get_user_preferences('auth_forcepasswordchange') ||
+        (!$USER->policyagreed && $CFG->sitepolicy)) {
         return '';
     }