From 6a3f1cdf1e9057c29d9a35af168016c67d32d5ff Mon Sep 17 00:00:00 2001 From: Bryan Deakin Date: Mon, 15 Jul 2013 17:51:36 +0100 Subject: [PATCH 1/2] fixes langauge issue from smf discussion Signed-off-by: Bryan Deakin --- themes/default/languages/ManageSettings.english.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/languages/ManageSettings.english.php b/themes/default/languages/ManageSettings.english.php index 417189e334..51217a8f42 100644 --- 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.'; From 4fb32b45f0e045c5dd2c776a6a7d0d73f9b8658f Mon Sep 17 00:00:00 2001 From: Joshua Dickerson Date: Thu, 9 May 2013 14:49:28 -0400 Subject: [PATCH 2/2] Extraneous checks Signed-off-by:Joshua Dickerson --- sources/subs/Topic.subs.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/subs/Topic.subs.php b/sources/subs/Topic.subs.php index 1e1b1502a3..2863be513e 100644 --- a/sources/subs/Topic.subs.php +++ b/sources/subs/Topic.subs.php @@ -1119,9 +1119,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('', '