From d2675df8b440b62b2bd8784356d19c2644043d8e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Sat, 24 May 2014 00:31:53 +0200
Subject: [PATCH] Use indented select list in TemplateAddForm

---
 wcfsetup/install/files/acp/templates/templateAdd.tpl        | 4 +---
 .../install/files/lib/acp/form/TemplateAddForm.class.php    | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index ff1e78e995..506b541405 100644
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -31,9 +31,7 @@
 					<dt><label for="templateGroupID">{lang}wcf.acp.template.group{/lang}</label></dt>
 					<dd>
 						<select name="templateGroupID" id="templateGroupID">
-							{foreach from=$availableTemplateGroups item=availableTemplateGroup}
-								<option value="{@$availableTemplateGroup->templateGroupID}"{if $availableTemplateGroup->templateGroupID == $templateGroupID} selected="selected"{/if}>{$availableTemplateGroup->templateGroupName}</option>
-							{/foreach}
+							{htmlOptions options=$availableTemplateGroups selected=$templateGroupID disableEncoding=true}
 						</select>
 					</dd>
 				</dl>
diff --git a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
index ba2178ad00..b134da106a 100644
--- a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
@@ -3,7 +3,6 @@ namespace wcf\acp\form;
 use wcf\data\package\Package;
 use wcf\data\package\PackageCache;
 use wcf\data\template\group\TemplateGroup;
-use wcf\data\template\group\TemplateGroupList;
 use wcf\data\template\Template;
 use wcf\data\template\TemplateAction;
 use wcf\form\AbstractForm;
@@ -218,10 +217,7 @@ class TemplateAddForm extends AbstractForm {
 	public function readData() {
 		parent::readData();
 		
-		$templateGroupList = new TemplateGroupList();
-		$templateGroupList->sqlOrderBy = "templateGroupName";
-		$templateGroupList->readObjects();
-		$this->availableTemplateGroups = $templateGroupList->getObjects();
+		$this->availableTemplateGroups = TemplateGroup::getSelectList();
 		
 		if (!count($_POST) && $this->copiedTemplate !== null) {
 			$this->tplName = $this->copiedTemplate->templateName;
-- 
2.20.1