diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-25 19:29:41 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-25 19:29:41 +0000 |
| commit | bdc6ae790e1fad43e19957043e8745bb1aff839d (patch) | |
| tree | e47f3387d55bb6486d8447d37d748db96edc4c9c | |
| parent | 6c5e5ae52c6e670c87897bcf9d4e03cdbe6b5192 (diff) | |
| download | elgg-bdc6ae790e1fad43e19957043e8745bb1aff839d.tar.gz elgg-bdc6ae790e1fad43e19957043e8745bb1aff839d.tar.bz2 | |
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
| -rw-r--r-- | mod/blog/blog_lib.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/blog/blog_lib.php b/mod/blog/blog_lib.php index 8c09260a3..2a52b7cd3 100644 --- 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); } |