merged, fixed a bug that blog tabs are displayed when blog is diabled

diff --git a/user/tabs.php b/user/tabs.php
index a67986f34e5ace9fe565bc6a010e2b53cd5e62e2..4b2ef6f818ce87f82a6e298df5b0fd00f63756e3 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -122,7 +122,7 @@
 
 
     /// Blog entry, everyone can view
-        if ($CFG->bloglevel > 1 or $USER->id == $user->id) {  // this is weird
+        if ($CFG->bloglevel > 0) { // only if blog is enabled. Permission check kicks in when display list
             $toprow[] = new tabobject('blogs', $CFG->wwwroot.'/blog/index.php?userid='.$user->id.'&courseid='.$course->id, get_string('blogs', 'blog'));
         }