From 4a7a63b639aa47b9a415e1c8b272437a1aec467d Mon Sep 17 00:00:00 2001
From: emanuele <emanuele45@gmail.com>
Date: Wed, 22 Jul 2015 11:11:15 +0200
Subject: [PATCH] Fix saving of settings in word censoring - fixes #2114

---
 sources/admin/ManagePosts.controller.php | 1 +
 themes/default/Admin.template.php        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sources/admin/ManagePosts.controller.php b/sources/admin/ManagePosts.controller.php
index fa0726d8c6..b963871daf 100644
--- a/sources/admin/ManagePosts.controller.php
+++ b/sources/admin/ManagePosts.controller.php
@@ -161,6 +161,7 @@ public function action_censor()
 				'censor_proper' => implode("\n", $censored_proper),
 				'censorWholeWord' => empty($_POST['censorWholeWord']) ? '0' : '1',
 				'censorIgnoreCase' => empty($_POST['censorIgnoreCase']) ? '0' : '1',
+				'allow_no_censored' => empty($_POST['allow_no_censored']) ? '0' : '1',
 			);
 
 			call_integration_hook('integrate_save_censors', array(&$updates));
diff --git a/themes/default/Admin.template.php b/themes/default/Admin.template.php
index 3b13776a31..83089364d7 100644
--- a/themes/default/Admin.template.php
+++ b/themes/default/Admin.template.php
@@ -753,10 +753,10 @@ function template_edit_censored()
 							<input type="checkbox" name="censorIgnoreCase" value="1" id="censorIgnoreCase_check"', empty($modSettings['censorIgnoreCase']) ? '' : ' checked="checked"', ' class="input_check" />
 						</dd>
 						<dt>
-							<a href="' . $scripturl . '?action=quickhelp;help=allow_no_censored" onclick="return reqOverlayDiv(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" class="icon" alt="' . $txt['help'] . '" /></a><label for="allow_no_censored">', $txt['censor_allow'], '</label></a></dt>
+							<a href="' . $scripturl . '?action=quickhelp;help=allow_no_censored" onclick="return reqOverlayDiv(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" class="icon" alt="' . $txt['help'] . '" /></a><label for="allow_no_censored">', $txt['censor_allow'], '</label></dt>
 						</dt>
 						<dd>
-							<input type="checkbox" name="censorAllow" value="1" id="allow_no_censored"', empty($modSettings['allow_no_censored']) ? '' : ' checked="checked"', ' class="input_check" />
+							<input type="checkbox" name="allow_no_censored" value="1" id="allow_no_censored"', empty($modSettings['allow_no_censored']) ? '' : ' checked="checked"', ' class="input_check" />
 						</dd>
 					</dl>
 					<input type="submit" name="save_censor" value="', $txt['save'], '" class="right_submit" />