Merge pull request #680 from norv/smallpicks

Tweaks
elkarte · Jul 18, 2013 · 9658cc5 · 9658cc5
2 parents 0d31015 + 4fb32b4
commit 9658cc5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/sources/subs/Topic.subs.php b/sources/subs/Topic.subs.php
@@ -1106,9 +1106,9 @@ function getTopicInfo($topic_parameters, $full = '', $selects = array(), $tables
 			'board' => (int) $board,
 		);
 
-	$messages_table = !empty($full) && ($full === 'message' || $full === 'all');
-	$follow_ups_table = !empty($full) && ($full === 'follow_up' || $full === 'all');
-	$logs_table = !empty($full) && $full === 'all';
+	$messages_table = $full === 'message' || $full === 'all';
+	$follow_ups_table = $full === 'follow_up' || $full === 'all';
+	$logs_table = $full === 'all';
 
 	// Create the query, taking full and integration in to account
 	$request = $db->query('', '
@@ -2585,4 +2585,4 @@ function messagesInTopics($topics)
 	$db->free_result($request);
 
 	return $messages;
-}
+}
diff --git a/themes/default/languages/ManageSettings.english.php b/themes/default/languages/ManageSettings.english.php
@@ -255,7 +255,7 @@
 $txt['setting_warning_mute_note'] = 'The user warning level after which a user cannot post any further - 0 to disable.';
 $txt['setting_user_limit'] = 'Maximum user warning points per day';
 $txt['setting_user_limit_note'] = 'This value is the maximum amount of warning points a single moderator can assign to a user in a 24 hour period - 0 for no limit.';
-$txt['setting_warning_decrement'] = 'Warning points to decrement from users every 24 hours';
+$txt['setting_warning_decrement'] = 'Warning points that are decreased every 24 hours';
 $txt['setting_warning_decrement_note'] = 'Only applies to users not warned within last 24 hours - set to 0 to disable.';
 $txt['setting_warning_show'] = 'Users who can see warning status';
 $txt['setting_warning_show_note'] = 'Determines who can see the warning level of users on the forum.';