Disregard -> Unwatch

Signed-off-by: Michael Eshom <[email protected]>

Sources/Display.php

@@ -162,7 +162,7 @@ function Display()
 			' . ($user_info['is_guest'] ? 't.id_last_msg + 1' : 'IFNULL(lt.id_msg, IFNULL(lmr.id_msg, -1)) + 1') . ' AS new_from
 			' . (!empty($modSettings['recycle_board']) && $modSettings['recycle_board'] == $board ? ', id_previous_board, id_previous_topic' : '') . '
 			' . (!empty($topic_selects) ? implode(',', $topic_selects) : '') . '
-			' . (!$user_info['is_guest'] ? ', IFNULL(lt.disregarded, 0) as disregarded' : '') . '
+			' . (!$user_info['is_guest'] ? ', IFNULL(lt.unwatched, 0) as unwatched' : '') . '
 		FROM {db_prefix}topics AS t
 			INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)' . ($user_info['is_guest'] ? '' : '
 			LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = {int:current_topic} AND lt.id_member = {int:current_member})
@@ -187,10 +187,10 @@ function Display()
 			$smcFunc['db_insert']($topicinfo['new_from'] == 0 ? 'ignore' : 'replace',
 				'{db_prefix}log_topics',
 				array(
-					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'disregarded' => 'int',
+					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
 				),
 				array(
-					$user_info['id'], $topicinfo['id'], $topicinfo['id_first_msg'], $topicinfo['disregarded'],
+					$user_info['id'], $topicinfo['id'], $topicinfo['id_first_msg'], $topicinfo['unwatched'],
 				),
 				array('id_member', 'id_topic')
 			);
@@ -201,7 +201,7 @@ function Display()
 	$context['real_num_replies'] = $context['num_replies'] = $topicinfo['num_replies'];
 	$context['topic_first_message'] = $topicinfo['id_first_msg'];
 	$context['topic_last_message'] = $topicinfo['id_last_msg'];
-	$context['topic_disregarded'] = isset($topicinfo['disregarded']) ? $topicinfo['disregarded'] : 0;
+	$context['topic_unwatched'] = isset($topicinfo['unwatched']) ? $topicinfo['unwatched'] : 0;
 
 	// Add up unapproved replies to get real number of replies...
 	if ($modSettings['postmod_active'] && allowedTo('approve_posts'))
@@ -864,10 +864,10 @@ function Display()
 			$smcFunc['db_insert']($topicinfo['new_from'] == 0 ? 'ignore' : 'replace',
 				'{db_prefix}log_topics',
 				array(
-					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'disregarded' => 'int',
+					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
 				),
 				array(
-					$user_info['id'], $topic, $mark_at_msg, $topicinfo['disregarded'],
+					$user_info['id'], $topic, $mark_at_msg, $topicinfo['unwatched'],
 				),
 				array('id_member', 'id_topic')
 			);
@@ -1102,7 +1102,7 @@ function Display()
 	$context['can_reply'] |= $context['can_reply_unapproved'];
 	$context['can_quote'] = $context['can_reply'] && (empty($modSettings['disabledBBC']) || !in_array('quote', explode(',', $modSettings['disabledBBC'])));
 	$context['can_mark_unread'] = !$user_info['is_guest'] && $settings['show_mark_read'];
-	$context['can_disregard'] = !$user_info['is_guest'] && $modSettings['enable_disregard'];
+	$context['can_unwatch'] = !$user_info['is_guest'] && $modSettings['enable_unwatch'];
 
 	$context['can_send_topic'] = (!$modSettings['postmod_active'] || $topicinfo['approved']) && allowedTo('send_topic');
 	$context['can_print'] = empty($modSettings['disable_print_topic']);
@@ -1173,7 +1173,7 @@ function Display()
 		'add_poll' => array('test' => 'can_add_poll', 'text' => 'add_poll', 'image' => 'add_poll.png', 'lang' => true, 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']),
 		'notify' => array('test' => 'can_mark_notify', 'text' => $context['is_marked_notify'] ? 'unnotify' : 'notify', 'image' => ($context['is_marked_notify'] ? 'un' : '') . 'notify.png', 'lang' => true, 'custom' => 'onclick="return confirm(\'' . ($context['is_marked_notify'] ? $txt['notification_disable_topic'] : $txt['notification_enable_topic']) . '\');"', 'url' => $scripturl . '?action=notify;sa=' . ($context['is_marked_notify'] ? 'off' : 'on') . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		'mark_unread' => array('test' => 'can_mark_unread', 'text' => 'mark_unread', 'image' => 'markunread.png', 'lang' => true, 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']),
-		'disregard' => array('test' => 'can_disregard', 'text' => ($context['topic_disregarded'] ? 'un' : '') . 'disregard', 'image' => ($context['topic_disregarded'] ? 'un' : '') . 'disregard.png', 'lang' => true, 'url' => $scripturl . '?action=disregardtopic;topic=' . $context['current_topic'] . '.' . $context['start'] . ';sa=' . ($context['topic_disregarded'] ? 'off' : 'on') . ';' . $context['session_var'] . '=' . $context['session_id']),
+		'unwatch' => array('test' => 'can_unwatch', 'text' => ($context['topic_unwatched'] ? '' : 'un') . 'watch', 'image' => ($context['topic_unwatched'] ? 'un' : '') . 'watch.png', 'lang' => true, 'url' => $scripturl . '?action=unwatchtopic;topic=' . $context['current_topic'] . '.' . $context['start'] . ';sa=' . ($context['topic_unwatched'] ? 'off' : 'on') . ';' . $context['session_var'] . '=' . $context['session_id']),
 		'send' => array('test' => 'can_send_topic', 'text' => 'send_topic', 'image' => 'sendtopic.png', 'lang' => true, 'url' => $scripturl . '?action=emailuser;sa=sendtopic;topic=' . $context['current_topic'] . '.0'),
 		'print' => array('test' => 'can_print', 'text' => 'print', 'image' => 'print.png', 'lang' => true, 'custom' => 'rel="new_win nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0'),
 	);

Sources/ManageSettings.php

@@ -503,7 +503,7 @@ function ModifyBasicSettings($return_config = false)
 			// Basic stuff, titles, flash, permissions...
 			array('check', 'allow_guestAccess'),
 			array('check', 'enable_buddylist'),
-			array('check', 'enable_disregard'),
+			array('check', 'enable_unwatch'),
 			array('check', 'allow_editDisplayName'),
 			array('check', 'allow_hideOnline'),
 			array('check', 'titlesEnable'),

Sources/MessageIndex.php

@@ -1160,7 +1160,7 @@ function QuickModeration()
 	if (!empty($markCache))
 	{
 		$smcFunc['db_query']('', '
-			SELECT id_topic, disregarded
+			SELECT id_topic, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:selected_topics})
 				AND id_member = {int:current_user}',
@@ -1171,7 +1171,7 @@ function QuickModeration()
 		);
 		$logged_topics = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['disregarded'];
+			$logged_topics[$row['id_topic']] = $row['unwatched'];
 		$smcFunc['db_free_result']($request);
 
 		$markArray = array();
@@ -1180,7 +1180,7 @@ function QuickModeration()
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
-			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'disregarded' => 'int'),
+			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
 			$markArray,
 			array('id_member', 'id_topic')
 		);

Sources/MoveTopic.php

@@ -456,7 +456,7 @@ function moveTopics($topics, $toBoard)
 	// Move over the mark_read data. (because it may be read and now not by some!)
 	$SaveAServer = max(0, $modSettings['maxMsgID'] - 50000);
 	$request = $smcFunc['db_query']('', '
-		SELECT lmr.id_member, lmr.id_msg, t.id_topic, IFNULL(lt.disregarded, 0) AS disregarded
+		SELECT lmr.id_member, lmr.id_msg, t.id_topic, IFNULL(lt.unwatched, 0) AS unwatched
 		FROM {db_prefix}topics AS t
 			INNER JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board
 				AND lmr.id_msg > t.id_first_msg AND lmr.id_msg > {int:protect_lmr_msg})
@@ -471,14 +471,14 @@ function moveTopics($topics, $toBoard)
 	$log_topics = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		$log_topics[] = array($row['id_topic'], $row['id_member'], $row['id_msg'], (is_null($row['disregarded']) ? 0 : $row['disregarded']));
+		$log_topics[] = array($row['id_topic'], $row['id_member'], $row['id_msg'], (is_null($row['unwatched']) ? 0 : $row['unwatched']));
 
 		// Prevent queries from getting too big. Taking some steam off.
 		if (count($log_topics) > 500)
 		{
 			$smcFunc['db_insert']('replace',
 				'{db_prefix}log_topics',
-				array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'disregarded' => 'int'),
+				array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 				$log_topics,
 				array('id_topic', 'id_member')
 			);
@@ -494,7 +494,7 @@ function moveTopics($topics, $toBoard)
 		// Insert that information into the database!
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
-			array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'disregarded' => 'int'),
+			array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 			$log_topics,
 			array('id_topic', 'id_member')
 		);

Sources/Notify.php

@@ -190,21 +190,21 @@ function BoardNotify()
  * The sub-action can be 'on', 'off', or nothing for what to do.
  * Requires the mark_any_notify permission.
  * Upon successful completion of action will direct user back to topic.
- * Accessed via ?action=disregardtopic.
+ * Accessed via ?action=unwatchtopic.
  */
-function TopicDisregard()
+function TopicUnwatch()
 {
 	global $smcFunc, $user_info, $topic, $modSettings;
 
 	// Let's do something only if the function is enabled
-	if (!$user_info['is_guest'] && $modSettings['enable_disregard'])
+	if (!$user_info['is_guest'] && $modSettings['enable_unwatch'])
 	{
 		checkSession('get');
 
 		if (isset($_GET['sa']))
 		{
 			$request = $smcFunc['db_query']('', '
-				SELECT id_member, id_topic, id_msg, disregarded
+				SELECT id_member, id_topic, id_msg, unwatched
 				FROM {db_prefix}log_topics
 				WHERE id_member = {int:current_user}
 					AND id_topic = {int:current_topic}',
@@ -218,7 +218,7 @@ function TopicDisregard()
 			if (empty($log))
 			{
 				$insert = true;
-				$log['disregarded'] = $_GET['sa'] == 'on' ? 1 : 0;
+				$log['unwatched'] = $_GET['sa'] == 'on' ? 1 : 0;
 			}
 			else
 			{
@@ -227,14 +227,14 @@ function TopicDisregard()
 					'id_member' => $user_info['id'],
 					'id_topic' => $topic,
 					'id_msg' => 0,
-					'disregarded' => $_GET['sa'] == 'on' ? 1 : 0,
+					'unwatched' => $_GET['sa'] == 'on' ? 1 : 0,
 				);
 			}
 
 			$smcFunc['db_insert']($insert ? 'insert' : 'replace',
 				'{db_prefix}log_topics',
 				array(
-					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'disregarded' => 'int',
+					'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
 				),
 				$log,
 				array('id_member', 'id_topic')

Sources/Profile-View.php

@@ -211,7 +211,7 @@ function showPosts($memID)
 			),
 			'topics' => array(
 			),
-			'disregardedtopics' => array(
+			'unwatchedtopics' => array(
 			),
 			'attach' => array(
 			),
@@ -221,7 +221,7 @@ function showPosts($memID)
 	// Shortcut used to determine which $txt['show*'] string to use for the title, based on the SA
 	$title = array(
 		'attach' => 'Attachments',
-		'disregardedtopics' => 'Disregarded',
+		'unwatchedtopics' => 'Unwatched',
 		'topics' => 'Topics'
 	);
 
@@ -240,9 +240,9 @@ function showPosts($memID)
 	// If we're specifically dealing with attachments use that function!
 	if (isset($_GET['sa']) && $_GET['sa'] == 'attach')
 		return showAttachments($memID);
-	// Instead, if we're dealing with disregarded topics (and the feature is enabled) use that other function.
-	elseif (isset($_GET['sa']) && $_GET['sa'] == 'disregardedtopics' && $modSettings['enable_disregard'])
-		return showDisregarded($memID);
+	// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
+	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics' && $modSettings['enable_unwatch'])
+		return showUnwatched($memID);
 
 	// Are we just viewing topics?
 	$context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false;
@@ -754,36 +754,36 @@ function list_getNumAttachments($boardsAllowed, $memID)
 }
 
 /**
- * Show all the disregarded topics.
+ * Show all the unwatched topics.
  *
  * @param int $memID id_member
  */
-function showDisregarded($memID)
+function showUnwatched($memID)
 {
 	global $txt, $user_info, $scripturl, $modSettings, $board, $context, $sourcedir, $smcFunc;
 
 	// Only the owner can see the list (if the function is enabled of course)
-	if ($user_info['id'] != $memID || !$modSettings['enable_disregard'])
+	if ($user_info['id'] != $memID || !$modSettings['enable_unwatch'])
 		return;
 
 	require_once($sourcedir . '/Subs-List.php');
 
 	// And here they are: the topics you don't like
 	$listOptions = array(
-		'id' => 'disregarded_topics',
+		'id' => 'unwatched_topics',
 		'width' => '100%',
 		'items_per_page' => $modSettings['defaultMaxMessages'],
-		'no_items_label' => $txt['disregarded_topics_none'],
-		'base_href' => $scripturl . '?action=profile;area=showposts;sa=disregardedtopics;u=' . $memID,
+		'no_items_label' => $txt['unwatched_topics_none'],
+		'base_href' => $scripturl . '?action=profile;area=showposts;sa=unwatchedtopics;u=' . $memID,
 		'default_sort_col' => 'started_on',
 		'get_items' => array(
-			'function' => 'list_getDisregarded',
+			'function' => 'list_getUnwatched',
 			'params' => array(
 				$memID,
 			),
 		),
 		'get_count' => array(
-			'function' => 'list_getNumDisregarded',
+			'function' => 'list_getNumUnwatched',
 			'params' => array(
 				$memID,
 			),
@@ -872,13 +872,13 @@ function showDisregarded($memID)
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';
-	$context['default_list'] = 'disregarded_topics';
+	$context['default_list'] = 'unwatched_topics';
 }
 
 /**
- * Get the relevant topics in the disregarded list
+ * Get the relevant topics in the unwatched list
  */
-function list_getDisregarded($start, $items_per_page, $sort, $memID)
+function list_getUnwatched($start, $items_per_page, $sort, $memID)
 {
 	global $smcFunc, $board, $modSettings, $context;
 
@@ -891,7 +891,7 @@ function list_getDisregarded($start, $items_per_page, $sort, $memID)
 			LEFT JOIN {db_prefix}messages as m ON (t.id_first_msg = m.id_msg)' . (in_array($sort, array('mem.real_name', 'mem.real_name DESC', 'mem.poster_time', 'mem.poster_time DESC')) ? '
 			LEFT JOIN {db_prefix}members as mem ON (m.id_member = mem.id_member)' : '') . '
 		WHERE lt.id_member = {int:current_member}
-			AND disregarded = 1
+			AND unwatched = 1
 			AND {query_see_board}
 		ORDER BY {raw:sort}
 		LIMIT {int:offset}, {int:limit}',
@@ -934,11 +934,11 @@ function list_getDisregarded($start, $items_per_page, $sort, $memID)
 }
 
 /**
- * Count the number of topics in the disregarded list
+ * Count the number of topics in the unwatched list
  *
  * @param int $memID
  */
-function list_getNumDisregarded($memID)
+function list_getNumUnwatched($memID)
 {
 	global $smcFunc, $user_info;
 
@@ -949,16 +949,16 @@ function list_getNumDisregarded($memID)
 		LEFT JOIN {db_prefix}topics as t ON (lt.id_topic = t.id_topic)
 		LEFT JOIN {db_prefix}boards as b ON (t.id_board = b.id_board)
 		WHERE id_member = {int:current_member}
-			AND disregarded = 1
+			AND unwatched = 1
 			AND {query_see_board}',
 		array(
 			'current_member' => $memID,
 		)
 	);
-	list ($disregardedCount) = $smcFunc['db_fetch_row']($request);
+	list ($unwatchedCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
-	return $disregardedCount;
+	return $unwatchedCount;
 }
 
 /**

Sources/Profile.php

@@ -109,7 +109,7 @@ function ModifyProfile($post_errors = array())
 					'subsections' => array(
 						'messages' => array($txt['showMessages'], array('profile_view_own', 'profile_view_any')),
 						'topics' => array($txt['showTopics'], array('profile_view_own', 'profile_view_any')),
-						'disregardedtopics' => array($txt['showDisregarded'], array('profile_view_own', 'profile_view_any'), 'enabled' => $modSettings['enable_disregard'] && $context['user']['is_owner']),
+						'unwatchedtopics' => array($txt['showUnwatched'], array('profile_view_own', 'profile_view_any'), 'enabled' => $modSettings['enable_unwatch'] && $context['user']['is_owner']),
 						'attach' => array($txt['showAttachments'], array('profile_view_own', 'profile_view_any')),
 					),
 					'permission' => array(

Sources/Recent.php

@@ -758,8 +758,8 @@ function UnreadTopics()
 			WHERE lt.id_member = {int:current_member}
 				AND t.' . $query_this_board . (empty($earliest_msg) ? '' : '
 				AND t.id_last_msg > {int:earliest_msg}') . ($modSettings['postmod_active'] ? '
-				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : ''),
+				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : ''),
 			array_merge($query_parameters, array(
 				'current_member' => $user_info['id'],
 				'earliest_msg' => !empty($earliest_msg) ? $earliest_msg : 0,
@@ -781,8 +781,8 @@ function UnreadTopics()
 			WHERE t.' . $query_this_board . (!empty($earliest_msg) ? '
 				AND t.id_last_msg > {int:earliest_msg}' : '') . '
 				AND IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0)) < t.id_last_msg' . ($modSettings['postmod_active'] ? '
-				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : ''),
+				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : ''),
 			array_merge($query_parameters, array(
 				'current_member' => $user_info['id'],
 				'earliest_msg' => !empty($earliest_msg) ? $earliest_msg : 0,
@@ -837,8 +837,8 @@ function UnreadTopics()
 			WHERE b.' . $query_this_board . '
 				AND t.id_last_msg >= {int:min_message}
 				AND IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0)) < t.id_last_msg' . ($modSettings['postmod_active'] ? '
-				AND ms.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : '') . '
+				AND ms.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : '') . '
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
 			array_merge($query_parameters, array(
@@ -863,8 +863,8 @@ function UnreadTopics()
 				AND t.id_last_msg > {int:earliest_msg}' : (!$context['showing_all_topics'] && empty($_SESSION['first_login']) ? '
 				AND t.id_last_msg > {int:id_msg_last_visit}' : '')) . '
 				AND IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0)) < t.id_last_msg' . ($modSettings['postmod_active'] ? '
-				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : ''),
+				AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : ''),
 			array_merge($query_parameters, array(
 				'current_member' => $user_info['id'],
 				'earliest_msg' => !empty($earliest_msg) ? $earliest_msg : 0,
@@ -925,8 +925,8 @@ function UnreadTopics()
 			WHERE t.' . $query_this_board . '
 				AND t.id_last_msg >= {int:min_message}
 				AND IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0)) < ml.id_msg' . ($modSettings['postmod_active'] ? '
-				AND ms.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : '') . '
+				AND ms.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : '') . '
 			ORDER BY {raw:order}
 			LIMIT {int:offset}, {int:limit}',
 			array_merge($query_parameters, array(
@@ -978,8 +978,8 @@ function UnreadTopics()
 					LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})' . (isset($sortKey_joins[$_REQUEST['sort']]) ? $sortKey_joins[$_REQUEST['sort']] : '') . '
 				WHERE m.id_member = {int:current_member}' . (!empty($board) ? '
 					AND t.id_board = {int:current_board}' : '') . ($modSettings['postmod_active'] ? '
-					AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-				AND lt.disregarded != 1' : '') . '
+					AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+				AND lt.unwatched != 1' : '') . '
 				GROUP BY m.id_topic',
 				array(
 					'current_board' => $board,
@@ -1032,8 +1032,8 @@ function UnreadTopics()
 				WHERE t.' . $query_this_board . '
 					AND m.id_member = {int:current_member}
 					AND IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0)) < t.id_last_msg' . ($modSettings['postmod_active'] ? '
-					AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_disregard'] ? '
-					AND lt.disregarded != 1' : ''),
+					AND t.approved = {int:is_approved}' : '') . ($modSettings['enable_unwatch'] ? '
+					AND lt.unwatched != 1' : ''),
 				array_merge($query_parameters, array(
 					'current_member' => $user_info['id'],
 					'is_approved' => 1,
@@ -1096,8 +1096,8 @@ function UnreadTopics()
 				WHERE t.' . $query_this_board . '
 					AND t.id_last_msg >= {int:min_message}
 					AND (IFNULL(lt.id_msg, IFNULL(lmr.id_msg, 0))) < t.id_last_msg
-					AND t.approved = {int:is_approved}' . ($modSettings['enable_disregard'] ? '
-					AND lt.disregarded != 1' : '') . '
+					AND t.approved = {int:is_approved}' . ($modSettings['enable_unwatch'] ? '
+					AND lt.unwatched != 1' : '') . '
 				ORDER BY {raw:order}
 				LIMIT {int:offset}, {int:limit}',
 				array_merge($query_parameters, array(

Sources/RemoveTopic.php

@@ -858,7 +858,7 @@ function removeMessage($message, $decreasePostCount = true)
 			if (!$user_info['is_guest'])
 				$smcFunc['db_insert']('replace',
 					'{db_prefix}log_topics',
-					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'disregarded' => 'int'),
+					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 					array($topicID, $user_info['id'], $modSettings['maxMsgID'], 0),
 					array('id_topic', 'id_member')
 				);

Sources/SplitTopics.php

@@ -753,7 +753,7 @@ function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject)
 	// Copy log topic entries.
 	// @todo This should really be chunked.
 	$request = $smcFunc['db_query']('', '
-		SELECT id_member, id_msg, disregarded
+		SELECT id_member, id_msg, unwatched
 		FROM {db_prefix}log_topics
 		WHERE id_topic = {int:id_topic}',
 		array(
@@ -764,11 +764,11 @@ function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject)
 	{
 		$replaceEntries = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['disregarded']);
+			$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_topics',
-			array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'disregarded' => 'int'),
+			array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 			$replaceEntries,
 			array('id_member', 'id_topic')
 		);
@@ -1432,9 +1432,9 @@ function MergeExecute($topics = array())
 	);
 
 	// Merge log topic entries.
-	// The disregard setting comes from the oldest topic
+	// The unwatch setting comes from the oldest topic
 	$request = $smcFunc['db_query']('', '
-		SELECT id_member, MIN(id_msg) AS new_id_msg, disregarded
+		SELECT id_member, MIN(id_msg) AS new_id_msg, unwatched
 		FROM {db_prefix}log_topics
 		WHERE id_topic IN ({array_int:topics})
 		GROUP BY id_member',
@@ -1446,11 +1446,11 @@ function MergeExecute($topics = array())
 	{
 		$replaceEntries = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['disregarded']);
+			$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
-			array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'disregarded' => 'int'),
+			array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 			$replaceEntries,
 			array('id_member', 'id_topic')
 		);

Sources/Subs-Boards.php

@@ -110,7 +110,7 @@ function markBoardsRead($boards, $unread = false)
 				AND t.id_board IN ({array_int:board_list}))
 		WHERE lt.id_member = {int:current_member}
 			AND lt.id_topic >= {int:lowest_topic}
-			AND lt.disregarded != 1',
+			AND lt.unwatched != 1',
 		array(
 			'current_member' => $user_info['id'],
 			'board_list' => $boards,
@@ -179,7 +179,7 @@ function MarkRead()
 		$topics = array_map('intval', explode('-', $_REQUEST['topics']));
 
 		$smcFunc['db_query']('', '
-			SELECT id_topic, disregarded
+			SELECT id_topic, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:selected_topics})
 				AND id_member = {int:current_user}',
@@ -190,7 +190,7 @@ function MarkRead()
 		);
 		$logged_topics = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['disregarded'];
+			$logged_topics[$row['id_topic']] = $row['unwatched'];
 		$smcFunc['db_free_result']($request);
 
 		$markRead = array();
@@ -199,7 +199,7 @@ function MarkRead()
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
-			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'disregarded' => 'int'),
+			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
 			$markRead,
 			array('id_member', 'id_topic')
 		);
@@ -215,7 +215,7 @@ function MarkRead()
 	{
 		// First, let's figure out what the latest message is.
 		$result = $smcFunc['db_query']('', '
-			SELECT t.id_first_msg, t.id_last_msg, IFNULL(lt.disregarded, 0) as disregarded
+			SELECT t.id_first_msg, t.id_last_msg, IFNULL(lt.unwatched, 0) as unwatched
 			FROM {db_prefix}topics as t
 			LEFT JOIN {db_prefix}log_topics as lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
 			WHERE t.id_topic = {int:current_topic}',
@@ -279,8 +279,8 @@ function MarkRead()
 		// Blam, unread!
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
-			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'disregarded' => 'int'),
-			array($earlyMsg, $user_info['id'], $topic, $topicinfo['disregarded']),
+			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
+			array($earlyMsg, $user_info['id'], $topic, $topicinfo['unwatched']),
 			array('id_member', 'id_topic')
 		);
 

Themes/default/languages/ManageSettings.english.php

@@ -20,7 +20,7 @@ $txt['allow_hideOnline'] = 'Allow non-administrators to hide their online status
 $txt['guest_hideContacts'] = 'Do not reveal contact details of members to guests';
 $txt['titlesEnable'] = 'Enable custom titles';
 $txt['enable_buddylist'] = 'Enable buddy/ignore lists';
-$txt['enable_disregard'] = 'Enable disregard topics';
+$txt['enable_unwatch'] = 'Enable unwatch topics';
 $txt['default_personal_text'] = 'Default personal text';
 $txt['default_personal_text_note'] = 'Personal text to assign to newly registered members.';
 $txt['time_format'] = 'Default time format';

Themes/default/languages/Profile.english.php

@@ -154,7 +154,7 @@ $txt['showPosts'] = 'Show Posts';
 $txt['showPosts_help'] = 'This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to.';
 $txt['showMessages'] = 'Messages';
 $txt['showTopics'] = 'Topics';
-$txt['showDisregarded'] = 'Disregarded topics';
+$txt['showUnwatched'] = 'Unwatched topics';
 $txt['showAttachments'] = 'Attachments';
 $txt['viewWarning_help'] = 'This section allows you to view all warnings issued to this member.';
 $txt['statPanel'] = 'Show Stats';
@@ -313,7 +313,7 @@ $txt['show_member_topics'] = 'View Member Topics';
 $txt['show_member_attachments'] = 'View Member Attachments';
 $txt['show_posts_none'] = 'No posts have been posted yet.';
 $txt['show_topics_none'] = 'No topics have been posted yet.';
-$txt['disregarded_topics_none'] = 'You don\'t have any topic in the disregarded list.';
+$txt['unwatched_topics_none'] = 'You don\'t have any topic in the unwatched list.';
 $txt['show_attachments_none'] = 'No attachments have been posted yet.';
 $txt['show_attach_filename'] = 'Filename';
 $txt['show_attach_downloads'] = 'Downloads';

Themes/default/languages/index.english.php

@@ -385,8 +385,8 @@ $txt['geek'] = 'I am a geek!!';
 $txt['info_center_title'] = '%1$s - Info Center';
 
 $txt['send_topic'] = 'Send this topic';
-$txt['disregard'] = 'Disregard';
-$txt['undisregard'] = 'Stop disregarding';
+$txt['watch'] = 'Watch';
+$txt['unwatch'] = 'Stop watching';
 
 $txt['sendtopic_title'] = 'Send the topic "%1$s" to a friend.';
 $txt['sendtopic_sender_name'] = 'Your name';

index.php

@@ -285,7 +285,6 @@ function smf_main()
 		'coppa' => array('Register.php', 'CoppaForm'),
 		'credits' => array('Who.php', 'Credits'),
 		'deletemsg' => array('RemoveTopic.php', 'DeleteMessage'),
-		'disregardtopic' => array('Notify.php', 'TopicDisregard'),
 		'dlattach' => array('Display.php', 'Download'),
 		'editpoll' => array('Poll.php', 'EditPoll'),
 		'editpoll2' => array('Poll.php', 'EditPoll2'),
@@ -345,6 +344,7 @@ function smf_main()
 		'about:unknown' => array('Karma.php', 'BookOfUnknown'),
 		'unread' => array('Recent.php', 'UnreadTopics'),
 		'unreadreplies' => array('Recent.php', 'UnreadTopics'),
+		'unwatchtopic' => array('Notify.php', 'TopicUnwatch'),
 		'verificationcode' => array('Register.php', 'VerificationCode'),
 		'viewprofile' => array('Profile.php', 'ModifyProfile'),
 		'vote' => array('Poll.php', 'Vote'),

other/install_2-1_mysql.sql

@@ -1159,7 +1159,7 @@ CREATE TABLE {$db_prefix}log_topics (
   id_member mediumint(8) unsigned NOT NULL default '0',
   id_topic mediumint(8) unsigned NOT NULL default '0',
   id_msg int(10) unsigned NOT NULL default '0',
-  disregarded tinyint(3) NOT NULL default '0',
+  unwatched tinyint(3) NOT NULL default '0',
   PRIMARY KEY (id_member, id_topic),
   KEY id_topic (id_topic)
 ) ENGINE=MyISAM;
@@ -1855,7 +1855,7 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('attachment_thumb_png', '1'),
 	('avatar_reencode', '1'),
 	('avatar_paranoid', '0'),
-	('enable_disregard', '0'),
+	('enable_unwatch', '0'),
 	('drafts_autosave_enabled', '1'),
 	('drafts_show_saved_enabled', '1'),
 	('drafts_keep_days', '7');

other/install_2-1_postgresql.sql

@@ -1525,7 +1525,7 @@ CREATE TABLE {$db_prefix}log_topics (
   id_member int NOT NULL default '0',
   id_topic int NOT NULL default '0',
   id_msg int NOT NULL default '0',
-  disregarded int NOT NULL default '0',
+  unwatched int NOT NULL default '0',
   PRIMARY KEY (id_member, id_topic)
 );
 
@@ -2344,7 +2344,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_image_par
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_thumb_png', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_reencode', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_paranoid', '0');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_disregard', '0');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_unwatch', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');

other/install_2-1_sqlite.sql

@@ -1249,7 +1249,7 @@ CREATE TABLE {$db_prefix}log_topics (
   id_member int NOT NULL default '0',
   id_topic int NOT NULL default '0',
   id_msg int NOT NULL default '0',
-  disregarded int NOT NULL default '0',
+  unwatched int NOT NULL default '0',
   PRIMARY KEY (id_member, id_topic)
 );
 
@@ -2000,7 +2000,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_image_par
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_thumb_png', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_reencode', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_paranoid', '0');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_disregard', '0');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_unwatch', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');

other/install_2-1_sqlite3.sql

@@ -1249,7 +1249,7 @@ CREATE TABLE {$db_prefix}log_topics (
   id_member int NOT NULL default '0',
   id_topic int NOT NULL default '0',
   id_msg int NOT NULL default '0',
-  disregarded int NOT NULL default '0',
+  unwatched int NOT NULL default '0',
   PRIMARY KEY (id_member, id_topic)
 );
 
@@ -2000,7 +2000,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_image_par
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_thumb_png', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_reencode', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_paranoid', '0');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_disregard', '0');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_unwatch', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');