diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-07-20 15:09:28 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-20 21:21:36 +0200 |
commit | 603dc1f78617e64e41f61daf85f463b0465123ec (patch) | |
tree | 1f0c7dd4f1bfacf78275c11e5ca966bcdc5938a9 /phpBB/includes/functions_posting.php | |
parent | e60816eeb12e70be88467d708685ffa49f177691 (diff) | |
download | forums-603dc1f78617e64e41f61daf85f463b0465123ec.tar forums-603dc1f78617e64e41f61daf85f463b0465123ec.tar.gz forums-603dc1f78617e64e41f61daf85f463b0465123ec.tar.bz2 forums-603dc1f78617e64e41f61daf85f463b0465123ec.tar.xz forums-603dc1f78617e64e41f61daf85f463b0465123ec.zip |
[ticket/11717] Use topic_posts_approved instead of topic_replies
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.
PHPBB3-11717
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 03565c27bb..f80736a6c4 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1995,6 +1995,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u } } + $first_post_topic_info = ($post_mode == 'edit_first_post' && (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) || + ($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) || + ($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1))); // Fix the post's and topic's visibility and first/last post information, when the post is edited if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility) { @@ -2007,7 +2010,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u $phpbb_content_visibility = $phpbb_container->get('content.visibility'); $phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest); } - else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])) + else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_topic_info) { if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility) { |