Avoid escaping relevant template variables

view/templates/settings/addons.tpl

@@ -5,7 +5,7 @@
 <form action="settings/addon" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{$settings_addons}}
+{{$settings_addons nofilter}}
 
 </form>
 

view/templates/settings/connectors.tpl

@@ -14,7 +14,7 @@
 	{{include file="field_checkbox.tpl" field=$disable_cw}}
 	{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
 	{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
-	{{$default_group}}
+	{{$default_group nofilter}}
 	{{include file="field_input.tpl" field=$legacy_contact}}
 
 	<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
@@ -23,7 +23,7 @@
 </div>
 <div class="clear"></div>
 
-{{$settings_connectors}}
+{{$settings_connectors nofilter}}
 
 {{if $mail_disabled}}
 
@@ -35,7 +35,7 @@
 	<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
 		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
-	<p>{{$imap_desc}}</p>
+	<p>{{$imap_desc nofilter}}</p>
 	{{include file="field_custom.tpl" field=$imap_lastcheck}}
 	{{include file="field_input.tpl" field=$mail_server}}
 	{{include file="field_input.tpl" field=$mail_port}}

view/templates/settings/display.tpl

@@ -31,7 +31,7 @@
 
 {{if $theme_config}}
 <h2>{{$stitle}}</h2>
-{{$theme_config}}
+{{$theme_config nofilter}}
 {{/if}}
 
 </form>

view/templates/settings/nick_set.tpl

@@ -1,6 +1,5 @@
 
-
-<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">{{$desc}}</div>
+<div id="settings-nick-wrapper">
+	<div id="settings-nickname-desc" class="info-message">{{$desc nofilter}}</div>
 </div>
 <div id="settings-nick-end" ></div>

view/templates/settings/settings.tpl

@@ -1,6 +1,6 @@
 <h1>{{$ptitle}}</h1>
 
-{{$nickname_block}}
+{{$nickname_block nofilter}}
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -45,21 +45,21 @@
 
 {{include file="field_input.tpl" field=$maxreq}}
 
-{{$profile_in_dir}}
+{{$profile_in_dir nofilter}}
 
-{{$profile_in_net_dir}}
+{{$profile_in_net_dir nofilter}}
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
-{{$hide_wall}}
+{{$hide_wall nofilter}}
 
-{{$blockwall}}
+{{$blockwall nofilter}}
 
-{{$blocktags}}
+{{$blocktags nofilter}}
 
-{{$suggestme}}
+{{$suggestme nofilter}}
 
-{{$unkmail}}
+{{$unkmail nofilter}}
 
 
 {{include file="field_input.tpl" field=$cntunkmail}}
@@ -90,7 +90,7 @@
 
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$aclselect}}
+			{{$aclselect nofilter}}
 		</div>
 	</div>
 
@@ -99,7 +99,7 @@
 <br/>
 <div id="settings-default-perms-end"></div>
 
-{{$group_select}}
+{{$group_select nofilter}}
 
 
 <div class="settings-submit-wrapper" >
@@ -196,7 +196,7 @@
 <div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
-{{$pagetype}}
+{{$pagetype nofilter}}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />