From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 13 Dec 2012 22:16:10 +0000 (+0100)
Subject: Removed obsolete code
X-Git-Tag: 2.0.0_Beta_1~709^2~1^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c2506bd2991a0be00f3489516dac8195e1f2fa3;p=GitHub%2FWoltLab%2FWCF.git

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 6f6c1a83b7..bed564e892 100644
--- 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 b8fa94b467..a913ab6d1a 100644
--- 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.
 	 *