From: toyomoyo <toyomoyo>
Date: Fri, 17 Aug 2007 08:16:11 +0000 (+0000)
Subject: merged fix for MDL-10037, hide hidden user's blogs from course view
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=df6d3c66aee7c5b727a56513ba22ab22b91b5873;p=moodle.git

merged fix for MDL-10037, hide hidden user's blogs from course view
---

diff --git a/blog/lib.php b/blog/lib.php
index 3c4859d387..ba831fe129 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -567,6 +567,13 @@
             case 'course':
                 // all users with a role assigned
                 $context = get_context_instance(CONTEXT_COURSE, $filterselect);
+                
+                // MDL-10037, hidden users' blogs should not appear
+                if (has_capability('moodle/role:viewhiddenassigns', $context)) {
+                    $hiddensql = ''; 
+                } else {                    
+                    $hiddensql = ' AND ra.hidden = 0 '; 
+                }
 
                 $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
                         .$CFG->prefix.'role_assignments ra, '.$CFG->prefix.'user u
@@ -574,7 +581,7 @@
                         AND ra.contextid '.get_related_contexts_string($context).'
                         AND u.id = p.userid
                         AND u.deleted = 0
-                        '.$permissionsql.$typesql;
+                        '.$hiddensql.$permissionsql.$typesql;
 
             break;