From 40ee04f43e791fc024963ff178211761ec8c86e9 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 2 Aug 2016 12:32:57 +0200
Subject: [PATCH] Avoid collision of template ids for mail splitter templates

---
 mail/inc/class.mail_ui.inc.php   | 4 ++--
 mail/js/app.js                   | 2 +-
 mail/templates/default/index.xet | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 94d84df3bb..e09ffa38d9 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -589,8 +589,8 @@ class mail_ui
 			self::callWizard($e->getMessage().($e->details?', '.$e->details:''),(isset($this->mail_bo)?false:true), 'error',false);
 			//return false;
 		}
-		// Check preview pane is enabled, then show spliter
-		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
+		// Check preview pane is enabled, then show splitter
+		if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('splitter', 'template', 'mail.index.nosplitter');
 
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
diff --git a/mail/js/app.js b/mail/js/app.js
index fd45a74f64..13d5f3865c 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3844,7 +3844,7 @@ app.classes.mail = AppJS.extend(
 	 */
 	loadIframe: function (_url, _iFrame)
 	{
-		var mailSplitter = this.et2.getWidgetById('mail.index.spliter');
+		var mailSplitter = this.et2.getWidgetById('splitter');
 		var quotaipercent = this.et2.getWidgetById('nm[quotainpercent]');
 		var iframe = _iFrame || this.et2.getWidgetById('extra_iframe');
 		if (typeof iframe != 'undefined' && iframe)
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index b0514f1696..7592623119 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -2,7 +2,7 @@
 <!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="mail.index.spliter" height="100%" template="" lang="" group="0" version="1.9.001">
+	<template id="mail.index.splitter" height="100%" template="" lang="" group="0" version="1.9.001">
 		<split dock_side="bottomDock" id="mailSplitter" orientation="h">
 			<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" header_left="mail.index.add" header_right="mail.index.header_right"/>
 			<vbox id="mailPreview" width="100%">
@@ -69,7 +69,7 @@
 			</vbox>
 		</split>
 	</template>
-	<template id="mail.index.nospliter" template="" lang="" group="0" version="1.9.001">
+	<template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">
 		<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" header_left="mail.index.add" header_right="mail.index.header_right"/>
 	</template>
 	<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
@@ -130,7 +130,7 @@
 	</template>
 	<template id="mail.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" highlighting="true"/>
-		<template id="mail.index.spliter" height="100%" template="mail.index.spliter"/>
+		<template id="splitter" height="100%" template="mail.index.splitter"/>
 		<iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
 	</template>
 </overlay>