Added access controls to blog archive grabbing function.

Corrected weird logic for checking validity of blog entities while displaying posts.

git-svn-id: http://code.elgg.org/elgg/trunk@5506 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/blog_lib.php b/mod/blog/blog_lib.php
index 8c09260a3a48e873da6cb118b03e587372e6af31..2a52b7cd379e92f43a0d2d50d5bef4989e21b02f 100644 (file)
--- a/mod/blog/blog_lib.php
+++ b/mod/blog/blog_lib.php
@@ -22,11 +22,11 @@ function blog_get_page_content_read($owner_guid = NULL, $guid = NULL) {
        if ($guid) {
                $blog = get_entity($guid);
 
-               if (!elgg_instanceof($blog, 'object', 'blog') && $blog->status == 'final') {
-                       $content .= elgg_echo('blog:error:post_not_found');
-               } else {
+               if (elgg_instanceof($blog, 'object', 'blog') && $blog->status == 'final') {
                        elgg_push_breadcrumb($blog->title, $blog->getURL());
                        $content .= elgg_view_entity($blog, TRUE);
+               } else {
+                       $content .= elgg_echo('blog:error:post_not_found');
                }
        } else {
                $options = array(
@@ -201,6 +201,8 @@ function blog_get_blog_months($user_guid = NULL, $container_guid = NULL) {
                $q .= " AND e.container_guid = $container_guid";
        }
 
+       $q .= ' AND ' . get_access_sql_suffix('e');
+
        return get_data($q);
 }