[Phpbb-checkins] r10079 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/mcp/mcp_forum.php includes/mcp/mcp_topic.php

[Joas S. <nic...@ph...>]

Author: nickvergessen
Date: Mon Aug 31 14:50:40 2009
New Revision: 10079

Log:
Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts"

Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Mon Aug 31 14:50:40 2009
***************
*** 203,208 ****
--- 203,209 ----
  		<li>[Fix] Only show &quot;Add friend&quot; and &quot;Add foe&quot; links if the specific module is enabled. (Bug #50475)</li>
  		<li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
  		<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
+ 		<li>[Fix] Fix handling of bookmarks and subscriptions on &quot;split topcis&quot;, &quot;merge topics&quot; and &quot;merge posts&quot;. (Bug #50035)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php Mon Aug 31 14:50:40 2009
***************
*** 416,426 ****
--- 416,429 ----
  
  		// 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 . '&amp;t=' . $to_topic_id) . '">', '</a>');

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php Mon Aug 31 14:50:40 2009
***************
*** 503,508 ****
--- 503,547 ----
  		// 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'] . '&amp;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 . '&amp;t=' . $to_topic_id) . '">', '</a>');
  	}
***************
*** 596,612 ****
--- 635,699 ----
  
  		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'] . '&amp;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