Merge pull request SimpleMachines#8833 from jdarwood007/2.1/fix8810

Author: Sesquipedalian

Sources/Profile-Modify.php

@@ -562,9 +562,6 @@ function $preload:		A function that is used to load data required for this eleme
 			{
 				loadLanguage('Settings');
 
-				$context['allow_no_censored'] = false;
-				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
 
 				return true;
 			},

Themes/default/Settings.template.php

@@ -65,6 +65,12 @@ function template_options()
 			'label' => $txt['show_no_signatures'],
 			'default' => true,
 		),
+		array(
+			'id' => 'show_no_censored',
+			'label' => $txt['show_no_censored'],
+			'default' => false,
+			'enabled' => !empty($modSettings['allow_no_censored']),
+		),
 		array(
 			'id' => 'posts_apply_ignore_list',
 			'label' => $txt['posts_apply_ignore_list'],