diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
| commit | 735cae076a2b2814e40dda08b5f4dacf0b408345 (patch) | |
| tree | 1011a958cfcfe84725d2a2a2f0e4894af24d8f0e /phpBB/posting.php | |
| parent | da41c754be14147de439fa0cc76bc682a84f7353 (diff) | |
| parent | 5b701dc3ed83345c70eabc1d88a721a7df8e43e5 (diff) | |
| download | forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.gz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.bz2 forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.xz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/6712] Properly explain result of setting the bump interval to 0.
[ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
[ticket/6712] Pass $post_data by the value instead of by the reference.
[ticket/6712] Bump does not create new topic icon on index.
Conflicts:
phpBB/includes/functions_posting.php
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 734e97742c..0809b5a685 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -319,35 +319,7 @@ if ($mode == 'bump') if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id']) && check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}")) { - $db->sql_transaction('begin'); - - $sql = 'UPDATE ' . POSTS_TABLE . " - SET post_time = $current_time - WHERE post_id = {$post_data['topic_last_post_id']} - AND topic_id = $topic_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_last_post_time = $current_time, - topic_bumped = 1, - topic_bumper = " . $user->data['user_id'] . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - update_post_information('forum', $forum_id); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lastpost_time = $current_time - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - $db->sql_transaction('commit'); - - markread('post', $forum_id, $topic_id, $current_time); - - add_log('mod', $forum_id, $topic_id, 'LOG_BUMP_TOPIC', $post_data['topic_title']); - - $meta_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p={$post_data['topic_last_post_id']}") . "#p{$post_data['topic_last_post_id']}"; + $meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time); meta_refresh(3, $meta_url); $message = $user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>'); |