mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
Merge branch 'ticket/rxu/6712' into develop-olympus
* ticket/rxu/6712: [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.
This commit is contained in:
@@ -321,35 +321,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>');
|
||||
|
Reference in New Issue
Block a user