From 1d3cb6b04409dfd421492c26e8fa7bb17b400947 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 11 Jun 2014 01:05:40 +0200
Subject: [PATCH] Fix typo in TemplateDiffPage

---
 .../install/files/acp/templates/templateDiff.tpl |  6 +++---
 .../lib/acp/page/TemplateDiffPage.class.php      | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index 55969a10f9..fb58acdae7 100644
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -17,7 +17,7 @@
 					<select name="parentID" id="{lang}wcf.acp.template.group.default{/lang}ID">
 						<option value="0"></option>
 						{assign var=depth value=0}
-						{foreach from=$templateGroupHierarchie item='templateGroup' key='templateGroupID'}
+						{foreach from=$templateGroupHierarchy item='templateGroup' key='templateGroupID'}
 							<option{if $templateGroup[hasTemplate] !== false && $templateGroup[hasTemplate] != $templateID} value="{$templateGroup[hasTemplate]}"{if $parent->templateID == $templateGroup[hasTemplate]} selected="selected"{/if}{else} disabled="disabled"{/if}>{@'&nbsp;'|str_repeat:$depth * 4}{if $templateGroupID}{$templateGroup[group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}</option>
 							{assign var=depth value=$depth + 1}
 						{/foreach}
@@ -48,7 +48,7 @@
 			<div class="containerPadding">
 				<header class="boxHeadline boxSubHeadline">
 					<h1>
-						{if $parent->templateGroupID}{$templateGroupHierarchie[$parent->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
+						{if $parent->templateGroupID}{$templateGroupHierarchy[$parent->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
 					</h1>
 					<p>{lang}wcf.acp.template.lastModificationTime{/lang}: {@$parent->lastModificationTime|time}</p>
 				</header>
@@ -85,7 +85,7 @@
 			<div class="containerPadding">
 				<header class="boxHeadline boxSubHeadline">
 					<h1>
-						{if $template->templateGroupID}{$templateGroupHierarchie[$template->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
+						{if $template->templateGroupID}{$templateGroupHierarchy[$template->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
 					</h1>
 					<p>{lang}wcf.acp.template.lastModificationTime{/lang}: {@$template->lastModificationTime|time}</p>
 				</header>
diff --git a/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php b/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
index c559df4708..8bd3e2a131 100644
--- a/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/TemplateDiffPage.class.php
@@ -85,23 +85,23 @@ class TemplateDiffPage extends AbstractPage {
 		$templateGroupList = new TemplateGroupList();
 		$templateGroupList->readObjects();
 		
-		// build template group hierarchie (template groups that are parents of the template group of the selected template)
-		$this->templateGroupHierarchie = array();
+		// build template group hierarchy (template groups that are parents of the template group of the selected template)
+		$this->templateGroupHierarchy = array();
 		$templateGroup = $templateGroupList->search($this->template->templateGroupID);
 		while ($templateGroup !== null) {
-			$this->templateGroupHierarchie[$templateGroup->templateGroupID] = array('group' => $templateGroup, 'hasTemplate' => false);
+			$this->templateGroupHierarchy[$templateGroup->templateGroupID] = array('group' => $templateGroup, 'hasTemplate' => false);
 			$templateGroup = $templateGroupList->search($templateGroup->parentTemplateGroupID);
 		}
-		$this->templateGroupHierarchie[0] = array('group' => array(), 'hasTemplate' => false);
+		$this->templateGroupHierarchy[0] = array('group' => array(), 'hasTemplate' => false);
 		
-		// find matching templates in the hierarchie
+		// find matching templates in the hierarchy
 		$templateList = new TemplateList();
 		$templateList->getConditionBuilder()->add('templateName = ?', array($this->template->templateName));
 		$templateList->getConditionBuilder()->add('application = ?', array($this->template->application));
-		$templateList->getConditionBuilder()->add('(template.templateGroupID IN(?) OR template.templateGroupID IS NULL)', array(array_keys($this->templateGroupHierarchie)));
+		$templateList->getConditionBuilder()->add('(template.templateGroupID IN(?) OR template.templateGroupID IS NULL)', array(array_keys($this->templateGroupHierarchy)));
 		$templateList->readObjects();
 		foreach ($templateList as $template) {
-			$this->templateGroupHierarchie[($template->templateGroupID ?: 0)]['hasTemplate'] = $template->templateID;
+			$this->templateGroupHierarchy[($template->templateGroupID ?: 0)]['hasTemplate'] = $template->templateID;
 		}
 		
 		// a valid parent template was given, calculate diff
@@ -124,7 +124,7 @@ class TemplateDiffPage extends AbstractPage {
 			'parentID' => $this->parentID,
 			'parent' => $this->parent,
 			'diff' => $this->diff,
-			'templateGroupHierarchie' => array_reverse($this->templateGroupHierarchie, true)
+			'templateGroupHierarchy' => array_reverse($this->templateGroupHierarchy, true)
 		));
 	}
 }
-- 
2.20.1