From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 21 May 2013 13:53:09 +0000 (+0200)
Subject: Resolved TODO
X-Git-Tag: 2.0.0_Beta_1~96^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f8f5755abfc54d42672ab77837e8e0331a2cdc97;p=GitHub%2FWoltLab%2FWCF.git

Resolved TODO
---

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 87e0c90fcc..169301b3b4 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -197,19 +197,19 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.user.search.display.columns{/lang}</legend>
 				
-				{* TODO: Do we still want all this columns supported? *}
-				{*if $optionTree|count}
+				{if $columnOptions|count}
 					<dl>
 						<dt>
 							<label>{lang}wcf.acp.user.search.display.columns.profile{/lang}</label>
 						</dt>
 						<dd>
-							{foreach from=$optionTree item=option}
+							{foreach from=$columnOptions item=optionData}
+								{assign var='option' value=$optionData.object}
 								<label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
 							{/foreach}
 						</dd>
 					</dl>
-				{/if*}
+				{/if}
 				
 				<dl>
 					<dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
index 60e3531e14..10ac784306 100755
--- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
@@ -245,7 +245,8 @@ class UserSearchForm extends UserOptionListForm {
 			'lastActivityTimeStart' => $this->lastActivityTimeStart,
 			'lastActivityTimeEnd' => $this->lastActivityTimeEnd,
 			'enabled' => $this->enabled,
-			'disabled' => $this->disabled
+			'disabled' => $this->disabled,
+			'columnOptions' => $this->optionHandler->getCategoryOptions('profile')
 		));
 	}