Removed obsolete code

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 6f6c1a83b72853ebfd0f7a3b8a0a3f8e5489cb5f..bed564e892710da77a051bf006c41e2f212d54f1 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
@@ -38,19 +38,15 @@ class ViewableUserOption extends DatabaseObjectDecorator {
         * Sets option values for a specific user.
         * 
         * @param       wcf\data\user\User      $user
-        * @param       string                  $outputType
         */
-       public function setOptionValue(User $user, $outputType = 'normal') {
+       public function setOptionValue(User $user) {
                $userOption = 'userOption' . $this->optionID;
                $optionValue = $user->{$userOption};
                
                // use output class
                if ($this->outputClass) {
                        $outputObj = $this->getOutputObject();
-                       
-                       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);
+                       $this->optionValue = $outputObj->getOutput($user, $this->getDecoratedObject(), $optionValue);
                }
                else {
                        $this->optionValue = StringUtil::encodeHTML($optionValue);

diff --git a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
index b8fa94b4672a362bd7a8286b968b22c30ad03d1e..a913ab6d1a0fc2ff40effbf963309381ec4db71b 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
@@ -14,26 +14,6 @@ use wcf\data\user\User;
  * @category   Community Framework
  */
 interface IUserOptionOutput {
-       /**
-        * Returns a short version of the html code for the output of the given user option.
-        * 
-        * @param       wcf\data\user\User                      $user
-        * @param       wcf\data\user\option\UserOption         $option
-        * @param       string                                  $value
-        * @return      string
-        */
-       public function getShortOutput(User $user, UserOption $option, $value);
-       
-       /**
-        * Returns a medium version of the html code for the output of the given user option.
-        * 
-        * @param       wcf\data\user\User                      $user
-        * @param       wcf\data\user\option\UserOption         $option
-        * @param       string                                  $value
-        * @return      string
-        */
-       public function getMediumOutput(User $user, UserOption $option, $value);
-       
        /**
         * Returns the html code for the output of the given user option.
         *