merged fix for MDL-8987, guests should not see blogs flagged as site blogs

diff --git a/blog/lib.php b/blog/lib.php
index 431d0b5689b5d6ed269ee0eed9201e5c59c9fcab..74eb57f18f542df3cf61da3e93fe6b983e0d1223 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -528,7 +528,7 @@
             $tagquerysql = '';
         }
 
-        if (isloggedin()) {
+        if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
             $permissionsql =  '(p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
         } else {
             $permissionsql =  'p.publishstate = \'public\'';