Removed obsolete code

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 2d24dd2591fce945e02282423f0429d07f3d0f9a..abbbfee1108ea1c6b9b47e1cbaf00bcf494f219a 100644 (file)
--- 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 a71cff6f25d7c6d074c8062b20154b023271e787..6f6c1a83b72853ebfd0f7a3b8a0a3f8e5489cb5f 100644 (file)
--- 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 (file)
index a9a75cb..0000000
--- a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace wcf\system\option\user;
-use wcf\data\user\option\UserOption;
-use wcf\data\user\User;
-
-/**
- * Any user option output class should implement this interface.
- * 
- * @author     Marcel Werk
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @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);
-} 
-?>