From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 19 Feb 2014 15:54:03 +0000 (+0100)
Subject: Fixes option output in ACP user list
X-Git-Tag: 2.0.3~30
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40c9e03691fa763d7c7779cee8732ba21fc0bc8f;p=GitHub%2FWoltLab%2FWCF.git

Fixes option output in ACP user list
---

diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
index a9bfc05aa8..a38c4ed8ab 100755
--- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
@@ -19,7 +19,7 @@ use wcf\util\StringUtil;
  * Shows the result of a user search.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2013 WoltLab GmbH
+ * @copyright	2001-2014 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	acp.page
@@ -272,9 +272,9 @@ class UserListPage extends SortablePage {
 						default:
 							if (isset($this->options[$column])) {
 								if ($this->options[$column]->outputClass) {
-									$this->options[$column]->setOptionValue($user);
+									$this->options[$column]->setOptionValue($user->getDecoratedObject());
 									$outputObj = $this->options[$column]->getOutputObject();
-									$this->columnValues[$user->userID][$column] = $outputObj->getOutput($user, $this->options[$column]->getDecoratedObject(), $user->{$column});
+									$this->columnValues[$user->userID][$column] = $outputObj->getOutput($user->getDecoratedObject(), $this->options[$column]->getDecoratedObject(), $user->{$column});
 								}
 								else {
 									$this->columnValues[$user->userID][$column] = StringUtil::encodeHTML($user->{$column});