diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:56:42 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:56:42 -0500 |
| commit | 904bcb86a054ab6256da565098eb9bd8ab20414b (patch) | |
| tree | eeda9394b577b3288503a87c06e1f7394c89031c /phpBB/includes | |
| parent | e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5 (diff) | |
| parent | 9399c7c46bd4e895a06127c19b27155008946726 (diff) | |
| download | forums-904bcb86a054ab6256da565098eb9bd8ab20414b.tar forums-904bcb86a054ab6256da565098eb9bd8ab20414b.tar.gz forums-904bcb86a054ab6256da565098eb9bd8ab20414b.tar.bz2 forums-904bcb86a054ab6256da565098eb9bd8ab20414b.tar.xz forums-904bcb86a054ab6256da565098eb9bd8ab20414b.zip | |
Merge branch 'ticket/callumacrae/7834' into develop-olympus
* ticket/callumacrae/7834:
[ticket/7834] Topic time didn't update when first post was deleted
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 72331a73c6..271039f415 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1479,7 +1479,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data) break; case 'delete_first_post': - $sql = 'SELECT p.post_id, p.poster_id, p.post_username, u.username, u.user_colour + $sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username, u.user_colour FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u WHERE p.topic_id = $topic_id AND p.poster_id = u.user_id @@ -1493,7 +1493,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data) $sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : ''; } - $sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "'"; + $sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "', topic_time = " . (int) $row['post_time']; // Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply" $sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : ''); |