From f95f80a1cda38f2a2d5d344050fe2ddb8389d8f3 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 13 Nov 2012 22:21:17 +0100 Subject: [PATCH] Removed obsolete code --- .../lib/data/user/option/UserOption.class.php | 6 ----- .../user/option/ViewableUserOption.class.php | 11 -------- ...erOptionOutputContactInformation.class.php | 27 ------------------- 3 files changed, 44 deletions(-) delete mode 100644 wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php index 2d24dd2591..abbbfee110 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php @@ -31,12 +31,6 @@ class UserOption extends Option { */ public $optionValue = ''; - /** - * output data - * @var array - */ - public $outputData = array(); - /** * user object * @var wcf\data\user\User diff --git a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php index a71cff6f25..6f6c1a83b7 100644 --- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php @@ -3,7 +3,6 @@ namespace wcf\data\user\option; use wcf\data\user\User; use wcf\data\DatabaseObjectDecorator; use wcf\system\exception\SystemException; -use wcf\system\option\user\IUserOptionOutputContactInformation; use wcf\util\ClassUtil; use wcf\util\StringUtil; @@ -35,12 +34,6 @@ class ViewableUserOption extends DatabaseObjectDecorator { */ public $optionValue = ''; - /** - * user option output data - * @var array - */ - public $outputData = array(); - /** * Sets option values for a specific user. * @@ -55,10 +48,6 @@ class ViewableUserOption extends DatabaseObjectDecorator { if ($this->outputClass) { $outputObj = $this->getOutputObject(); - if ($outputObj instanceof IUserOptionOutputContactInformation) { - $this->outputData = $outputObj->getOutputData($user, $this->getDecoratedObject(), $optionValue); - } - if ($outputType == 'normal') $this->optionValue = $outputObj->getOutput($user, $this->getDecoratedObject(), $optionValue); else if ($outputType == 'short') $this->optionValue = $outputObj->getShortOutput($user, $this->getDecoratedObject(), $optionValue); else $outputType = $outputObj->getMediumOutput($user, $this->getDecoratedObject(), $optionValue); diff --git a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php deleted file mode 100644 index a9a75cb74a..0000000000 --- a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.option.user - * @category Community Framework - */ -interface IUserOptionOutputContactInformation { - /** - * Returns the output data of this user option. - * - * @param wcf\data\user\User $user - * @param wcf\data\user\option\UserOption $optionData - * @param string $value - * @return array - */ - public function getOutputData(User $user, UserOption $option, $value); -} -?> -- 2.20.1