From eabc4ce419e5876148f0988a0627549581e38c8d Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Wed, 2 Sep 2015 16:40:59 +0700
Subject: [PATCH] fix sidebar and change mail fix #707

---
 .../ActionSettings/account.change_email_confirm.tpl       | 1 +
 .../skin/developer/emails/email.user_changemail_to.tpl    | 2 +-
 .../frontend/skin/developer/layouts/layout.base.tpl       | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/frontend/skin/developer/actions/ActionSettings/account.change_email_confirm.tpl b/application/frontend/skin/developer/actions/ActionSettings/account.change_email_confirm.tpl
index e35c3f7f..66c1b1d6 100644
--- a/application/frontend/skin/developer/actions/ActionSettings/account.change_email_confirm.tpl
+++ b/application/frontend/skin/developer/actions/ActionSettings/account.change_email_confirm.tpl
@@ -6,6 +6,7 @@
 
 {block 'layout_options' append}
     {$layoutShowSystemMessages = false}
+    {$layoutShowSidebar = false}
 {/block}
 
 {block 'layout_content'}
diff --git a/application/frontend/skin/developer/emails/email.user_changemail_to.tpl b/application/frontend/skin/developer/emails/email.user_changemail_to.tpl
index 8fd6e6d5..7bd89a75 100644
--- a/application/frontend/skin/developer/emails/email.user_changemail_to.tpl
+++ b/application/frontend/skin/developer/emails/email.user_changemail_to.tpl
@@ -10,6 +10,6 @@
 		'user_name'  => $oUser->getDisplayName(),
 		'mail_old'   => $oChangemail->getMailFrom(),
 		'mail_new'   => $oChangemail->getMailTo(),
-		'change_url' => "{router page='profile'}changemail/confirm-to/{$oChangemail->getCodeFrom()}/"
+		'change_url' => "{router page='profile'}changemail/confirm-to/{$oChangemail->getCodeTo()}/"
 	]}
 {/block}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/layouts/layout.base.tpl b/application/frontend/skin/developer/layouts/layout.base.tpl
index 4277e1dd..a6946513 100644
--- a/application/frontend/skin/developer/layouts/layout.base.tpl
+++ b/application/frontend/skin/developer/layouts/layout.base.tpl
@@ -20,10 +20,12 @@
 
 {block 'layout_head' append}
     {* Получаем блоки для вывода в сайдбаре *}
-    {show_blocks group='right' assign=layoutSidebarBlocks}
+    {if $layoutShowSidebar}
+        {show_blocks group='right' assign=layoutSidebarBlocks}
 
-    {$layoutSidebarBlocks = trim( $layoutSidebarBlocks )}
-    {$layoutShowSidebar = !!$layoutSidebarBlocks && $layoutShowSidebar}
+        {$layoutSidebarBlocks = trim( $layoutSidebarBlocks )}
+        {$layoutShowSidebar = !!$layoutSidebarBlocks}
+    {/if}
 
     <script>
         ls.lang.load({json var = $aLangJs});