Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4006e18
)
Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle
author
Andrew Nicols
<andrew@nicols.co.uk>
Thu, 17 Nov 2016 06:33:39 +0000
(14:33 +0800)
committer
Andrew Nicols
<andrew@nicols.co.uk>
Thu, 17 Nov 2016 06:33:39 +0000
(14:33 +0800)
message/output/popup/lib.php
patch
|
blob
|
blame
|
history
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 '';
}