- Bugfix: added more permissions checks. Patches #60-62 by Al. Should fix

  bug #2163 and #2164.

6 files changed, 10 insertions, 6 deletions

diff --git a/modules/archive.module b/modules/archive.module
index c29546da3..1afd48cc1 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -161,7 +161,7 @@ function archive_block($op = "list", $delta = 0) {
     $blocks[0]["info"] = t("Calendar to browse archives");
     return $blocks;
   }
-  else {
+  else if (user_access("access content")) {
     switch ($delta) {
       case 0:
         $block["subject"] = t("Browse archives");
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index c29546da3..1afd48cc1 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -161,7 +161,7 @@ function archive_block($op = "list", $delta = 0) {
     $blocks[0]["info"] = t("Calendar to browse archives");
     return $blocks;
   }
-  else {
+  else if (user_access("access content")) {
     switch ($delta) {
       case 0:
         $block["subject"] = t("Browse archives");
diff --git a/modules/blog.module b/modules/blog.module
index e360431c1..939ba82b1 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -65,7 +65,9 @@ function blog_user($type, &$edit, &$user) {
   switch ($type) {
     case "view_public":
     case "view_private":
-      return form_item(t("Blog"), l(t("view recent blog entries"), "blog/$user->uid", array("title" => t("Read %username's latest blog entries.", array("%username" => $user->name)))));
+      if (user_access("maintain personal blog", $user)) {
+        return form_item(t("Blog"), l(t("view recent blog entries"), "blog/$user->uid", array("title" => t("Read %username's latest blog entries.", array("%username" => $user->name)))));
+      }
   }
 }
 
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index e360431c1..939ba82b1 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -65,7 +65,9 @@ function blog_user($type, &$edit, &$user) {
   switch ($type) {
     case "view_public":
     case "view_private":
-      return form_item(t("Blog"), l(t("view recent blog entries"), "blog/$user->uid", array("title" => t("Read %username's latest blog entries.", array("%username" => $user->name)))));
+      if (user_access("maintain personal blog", $user)) {
+        return form_item(t("Blog"), l(t("view recent blog entries"), "blog/$user->uid", array("title" => t("Read %username's latest blog entries.", array("%username" => $user->name)))));
+      }
   }
 }
 
diff --git a/modules/statistics.module b/modules/statistics.module
index ad0180a6a..7804bb970 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -710,7 +710,7 @@ function statistics_block($op = "list", $delta = 0) {
     }
     return $blocks;
   }
-  else {
+  else if (user_access("access content")) {
     switch($delta) {
       case 0:
         $block["subject"] = variable_get("statistics_block_top_title", t("Popular content"));
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index ad0180a6a..7804bb970 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -710,7 +710,7 @@ function statistics_block($op = "list", $delta = 0) {
     }
     return $blocks;
   }
-  else {
+  else if (user_access("access content")) {
     switch($delta) {
       case 0:
         $block["subject"] = variable_get("statistics_block_top_title", t("Popular content"));