diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
| commit | bb3c9a26bb75c76c5934d327548bf08606467b9f (patch) | |
| tree | 26760aa866799fc70683ef6845bf54fb17bdc955 /mod/blog/lib | |
| parent | 2feedf39f6484879333a7b77fdc3c184150db8c7 (diff) | |
| parent | 398572fd96c72b363fd5a252fb9cbe1cecab1e04 (diff) | |
| download | elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.gz elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.bz2 | |
Merge branch 'floxglove-3' into saravea
Conflicts:
.gitmodules
Diffstat (limited to 'mod/blog/lib')
| -rw-r--r-- | mod/blog/lib/blog.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index 3c71dfbab..9753f27a8 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -39,8 +39,8 @@ function blog_get_page_content_read($guid = NULL) { elgg_push_breadcrumb($blog->title); $return['content'] = elgg_view_entity($blog, array('full_view' => true)); - //check to see if comment are on - if ($blog->comments_on != 'Off') { + // check to see if we should allow comments + if ($blog->comments_on != 'Off' && $blog->status == 'published') { $return['content'] .= elgg_view_comments($blog); } @@ -363,6 +363,10 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) { $values[$field] = $post->$field; } } + + if ($post->status == 'draft') { + $values['access_id'] = $post->future_access; + } } if (elgg_is_sticky_form('blog')) { |