diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-03 11:35:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-03 11:35:39 +0000 |
| commit | 8bae4958749d32fcc5c34b955232045269b453f0 (patch) | |
| tree | fd3d6f47250b1c909f623eccefa45729ffc29c07 /phpBB/includes/mcp | |
| parent | 485576395cf99297ff54046079b409eb9c59a1d1 (diff) | |
| download | forums-8bae4958749d32fcc5c34b955232045269b453f0.tar forums-8bae4958749d32fcc5c34b955232045269b453f0.tar.gz forums-8bae4958749d32fcc5c34b955232045269b453f0.tar.bz2 forums-8bae4958749d32fcc5c34b955232045269b453f0.tar.xz forums-8bae4958749d32fcc5c34b955232045269b453f0.zip | |
revert r10079 (bug #50035) to be able to investigate other options of handling this later.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 87 |
2 files changed, 0 insertions, 90 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index acb7aa4ac0..b70601b479 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -416,14 +416,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) // If the topic no longer exist, we will update the topic watch table. // To not let it error out on users watching both topics, we just return on an error... - // Same for Bookmarks $db->sql_return_on_error(true); $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); $db->sql_return_on_error(false); $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); // Link to the new topic $return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>'); diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index eb3d6d3970..abdb839e7b 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -504,45 +504,6 @@ function split_topic($action, $topic_id, $to_forum_id, $subject) // Update forum statistics set_config_count('num_topics', 1, true); - // Add new topic to bookmarks - $bookmarks = array(); - $sql = 'SELECT user_id - FROM ' . BOOKMARKS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $bookmarks[] = array( - 'user_id' => (int) $row['user_id'], - 'topic_id' => $to_topic_id, - ); - } - $db->sql_freeresult($result); - if (sizeof($bookmarks)) - { - $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks); - } - - // Add new topic to watch-list - $notifications = array(); - $sql = 'SELECT user_id, notify_status - FROM ' . TOPICS_WATCH_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $notifications[] = array( - 'user_id' => (int) $row['user_id'], - 'topic_id' => $to_topic_id, - 'notify_status' => (int) $row['notify_status'], - ); - } - $db->sql_freeresult($result); - if (sizeof($notifications)) - { - $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications); - } - // Link back to both topics $return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']) . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>'); } @@ -636,65 +597,17 @@ function merge_posts($topic_id, $to_topic_id) if ($row) { - // Add new topic to bookmarks - $bookmarks = array(); - $sql = 'SELECT user_id - FROM ' . BOOKMARKS_TABLE . ' - WHERE topic_id = ' . (int) $topic_id; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $bookmarks[] = array( - 'user_id' => (int) $row['user_id'], - 'topic_id' => (int) $to_topic_id, - ); - } - $db->sql_freeresult($result); - if (sizeof($bookmarks)) - { - // To not let it error out on users, who already bookmarked the topic, we just return on an error... - $db->sql_return_on_error(true); - $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks); - $db->sql_return_on_error(false); - } - - // Add new topic to notifications - $notifications = array(); - $sql = 'SELECT user_id, notify_status - FROM ' . TOPICS_WATCH_TABLE . ' - WHERE topic_id = ' . (int) $topic_id; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $notifications[] = array( - 'user_id' => (int) $row['user_id'], - 'topic_id' => (int) $to_topic_id, - 'notify_status' => (int) $row['notify_status'], - ); - } - $db->sql_freeresult($result); - if (sizeof($notifications)) - { - // To not let it error out on users, who already watch the topic, we just return on an error... - $db->sql_return_on_error(true); - $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications); - $db->sql_return_on_error(false); - } - $return_link .= sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $topic_id) . '">', '</a>'); } else { // If the topic no longer exist, we will update the topic watch table. // To not let it error out on users watching both topics, we just return on an error... - // Same for bookmarks $db->sql_return_on_error(true); $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id); - $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id); $db->sql_return_on_error(false); $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id); - $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $topic_id); } // Link to the new topic |