Resolved TODO

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 87e0c90fcc08811c4ad32cf2d71b1343a455886f..169301b3b47edbdc6905c9a9a70d93be7c79feed 100644 (file)
--- 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 60e3531e14e4eca0424bf59adcd1476894ac5ae3..10ac7843060e1e317c5200a569888c284c6c2627 100755 (executable)
--- 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')
                ));
        }