Index: branches/1.2.x/in-bulletin/elements/html_head.elm.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/in-bulletin/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 16344)
@@ -6,7 +6,7 @@
 
 	$(document).ready(
 		function () {
-			aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+			aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1" js_escape="1"/>');
 		}
 	);
 </script>
\ No newline at end of file
Index: branches/1.2.x/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -N -r14593 -r16344
--- branches/1.2.x/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 14593)
+++ branches/1.2.x/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 16344)
@@ -42,7 +42,7 @@
 
 				<form method="POST" action="<inp2:m_FormAction />">
 					<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" />&nbsp;
 					<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
 					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
 				</form>
Index: branches/1.2.x/maintenance.tpl
===================================================================
diff -u -N -r15167 -r16344
--- branches/1.2.x/maintenance.tpl	(.../maintenance.tpl)	(revision 15167)
+++ branches/1.2.x/maintenance.tpl	(.../maintenance.tpl)	(revision 16344)
@@ -157,7 +157,7 @@
 		}
 
 		function close_windows() {
-			page = '<inp2:m_Link template="login" js_escape="1" no_amp="1" index_file="admin/index.php" __NO_REWRITE__="1" m_cat_id="0" m_wid=""/>';
+			page = '<inp2:m_Link template="login" index_file="admin/index.php" __NO_REWRITE__="1" m_cat_id="0" m_wid="" no_amp="1" js_escape="1"/>';
 			a_parent.location.href = page;
 
 			for (var c = (to_close.length - 1); c >= 0; c--) {
Index: branches/1.2.x/platform/login/forgot_password_reset_notice.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 16344)
@@ -46,7 +46,7 @@
 					<inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
 					<br /><br />
 
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // forgot password reset confirm -->
Index: branches/1.2.x/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 14274)
+++ branches/1.2.x/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 16344)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_TextUnsubscribe"/>
 				<br /><br />
 
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index" no_amp="1" js_escape="1"/>'" />&nbsp;
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/1.2.x/platform/mailing_list/subscribe_ok.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 14274)
+++ branches/1.2.x/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 16344)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_ThankForSubscribing"/>
 				<br /><br />
 
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index" no_amp="1" js_escape="1"/>'" />&nbsp;
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/1.2.x/in-commerce/elements/forms.elm.tpl
===================================================================
diff -u -N -r15526 -r16344
--- branches/1.2.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15526)
+++ branches/1.2.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 16344)
@@ -41,7 +41,7 @@
 
 	<script type="text/javascript">
 		function showAffiliateAgreement() {
-			window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+			window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" no_amp="1" js_escape="1"/>', null, 'menubar=no,toolbars=no,width=500,height=300');
 		}
 	</script>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r15585 -r16344
--- branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 15585)
+++ branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 16344)
@@ -62,7 +62,7 @@
 							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
 
 							<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_SendPassword' no_editing='1'/>" />
-							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
+							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
 						</inp2:m_RenderElement>
 					</table>
 				</form>
Index: branches/1.2.x/platform/login/activate_confirm.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/login/activate_confirm.tpl	(.../activate_confirm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/activate_confirm.tpl	(.../activate_confirm.tpl)	(revision 16344)
@@ -46,7 +46,7 @@
 					<inp2:m_Phrase name="lu_RegistrationCompleted"/>
 
 					<br /><br />
-					<input type="button" value="<inp2:m_Phrase label='lu_btn_Ok'/>" class="button" onclick="redirect('<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>');"/>
+					<input type="button" value="<inp2:m_Phrase label='lu_btn_Ok'/>" class="button" onclick="redirect('<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1' no_amp='1' js_escape='1'/>');"/>
 				<inp2:m_else />
 					<span class="field-error"><inp2:u_Error field="PwResetConfirm"/></span>
 					<br /><br />
Index: branches/1.2.x/in-commerce/my_account/cancel_recurring.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/in-commerce/my_account/cancel_recurring.tpl	(.../cancel_recurring.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/my_account/cancel_recurring.tpl	(.../cancel_recurring.tpl)	(revision 16344)
@@ -61,7 +61,7 @@
 							<br />
 							<form method="POST" action="<inp2:m_FormAction />">
 								<input class="button" name="events[ord][OnCancelRecurring]" type="submit" value="<inp2:m_Phrase label="lu_Yes" no_editing="1"/>" />&nbsp;
-								<input class="button" type="button" value="<inp2:m_Phrase label="lu_No" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account"/>'" />&nbsp;
+								<input class="button" type="button" value="<inp2:m_Phrase label="lu_No" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account" no_amp="1" js_escape="1"/>'" />&nbsp;
 								<input type="hidden" name="cancelrecurring_ok_template" value="in-commerce/my_account/cancel_recurring_ok"/>
 							</form>
 						</td>
Index: branches/1.2.x/platform/recommend/recommend.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 14274)
+++ branches/1.2.x/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 16344)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_recommend_confirm_text" />
 				<br /><br />
 
-				<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" />');" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>"/>
+				<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>"/>
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/1.2.x/in-bulletin/topics/new_topic.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/in-bulletin/topics/new_topic.tpl	(.../new_topic.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/topics/new_topic.tpl	(.../new_topic.tpl)	(revision 16344)
@@ -65,7 +65,7 @@
 								<input type="hidden" name="suggest_confirm_template" value="in-bulletin/topics/add_confirm"/>
 								<input type="hidden" name="suggest_pending_confirm_template" value="in-bulletin/topics/add_pending_confirm"/>
 								<input class="button" type="submit" name="events[bb][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
-								<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="__default__"/>');"/>
+								<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="__default__" no_amp="1" js_escape="1"/>');"/>
 							</inp2:m_RenderElement>
 						</table>
 					</form>
Index: branches/1.2.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r16269 -r16344
--- branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 16269)
+++ branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 16344)
@@ -28,14 +28,14 @@
 		<script type="text/javascript">
 			FormManager.init(
 				{
-					url: '<inp2:m_Link template="#TEMPLATE#" js_escape="1" __NO_REWRITE__="1" no_amp="1"/>',
+					url: '<inp2:m_Link template="#TEMPLATE#" __NO_REWRITE__="1" no_amp="1" js_escape="1"/>',
 //					windowManager: new FormManager_WindowManagerThickBox()
 					windowManager: new FormManager_WindowManagerColorBox()
 //					windowManager: new FormManager_WindowManagerFancyBox()
 				}
 			);
 
-			var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+			var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" size="#SIZE#" no_amp="1" js_escape="1"/>');
 
 			<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
 				<inp2:m_DefineElement name="ml_selector_language_element">
Index: branches/1.2.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl	(.../affiliate_navigation.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl	(.../affiliate_navigation.elm.tpl)	(revision 16344)
@@ -19,6 +19,6 @@
 
 <script type="text/javascript">
 function showAffiliateAgreement() {
-	window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+	window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" no_amp="1" js_escape="1"/>', null, 'menubar=no,toolbars=no,width=500,height=300');
 }
 </script>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -N -r15526 -r16344
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 15526)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 16344)
@@ -94,7 +94,7 @@
 
 	<script language="JavaScript">
 	function showCVV2Help(){
-		window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
+		window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" no_amp="1" js_escape="1"/>', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
 	}
 	</script>
 </inp2:m_DefineElement>
Index: branches/1.2.x/in-bulletin/my_account/private_messages/new_message.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/in-bulletin/my_account/private_messages/new_message.tpl	(.../new_message.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/my_account/private_messages/new_message.tpl	(.../new_message.tpl)	(revision 16344)
@@ -62,7 +62,7 @@
 						<inp2:m_RenderElement design="inp_edit_buttons">
 							<input type="hidden" name="next_template" value="in-bulletin/my_account/private_messages/add_confirm"/>
 							<input class="button" type="submit" name="events[private-message][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
-							<input class="button" type="button" onclick="redirect('<inp2:m_Link template="in-bulletin/my_account/private_messages/private_messages"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
+							<input class="button" type="button" onclick="redirect('<inp2:m_Link template="in-bulletin/my_account/private_messages/private_messages" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
 						</inp2:m_RenderElement>
 					</table>
 				</form>
Index: branches/1.2.x/platform/login/forgot_password_reset_confirm.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 16344)
@@ -47,7 +47,7 @@
 
 					<br /><br />
 
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index"/>');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index" no_amp="1" js_escape="1"/>');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // forgot password reset confirm -->
Index: branches/1.2.x/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -N -r14593 -r16344
--- branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 14593)
+++ branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 16344)
@@ -42,7 +42,7 @@
 
 				<form method="POST" action="<inp2:m_FormAction />">
 					<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" />&nbsp;
 					<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
 					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
 				</form>
Index: branches/1.2.x/platform/login/register_confirm.tpl
===================================================================
diff -u -N -r14274 -r16344
--- branches/1.2.x/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 16344)
@@ -49,7 +49,7 @@
 					</inp2:m_if>
 
 					<br /><br />
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // registration confirmation -->