X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=message%2Foutput%2Fpopup%2Flib.php;h=a051f936f1817527cac0df6f2df4e16af8da3894;hp=220515fde81a4e98a7178b95ac6eeb97aeafb00c;hb=2f0cd733be44cea3d38b42353a78a2b27134c0c8;hpb=4006e187f32f76a4c6fa41e7082995ccb9a3c9b2;ds=sidebyside

diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php
index 220515fde81..a051f936f18 100644
--- 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 '';
     }