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

2016-11-17 14:33:39 +08:00
parent 4006e187f3 b5b7af96bb
commit 2f0cd733be
1 changed files with 2 additions and 1 deletions
@@ -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 '';
    }