X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=files%2Flib%2Fdata%2Fconversation%2Fmessage%2FViewableConversationMessage.class.php;h=52c980f0af82fef44ab8dd78487e80c024796e23;hb=c032049ef971efe93e2404f120b600913d1732b4;hp=d8a74e80c392a911949134cba8db037594803f61;hpb=d95b74fb707c7a9e03bda95c7175452849f7d874;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

diff --git a/files/lib/data/conversation/message/ViewableConversationMessage.class.php b/files/lib/data/conversation/message/ViewableConversationMessage.class.php
index d8a74e8..52c980f 100644
--- a/files/lib/data/conversation/message/ViewableConversationMessage.class.php
+++ b/files/lib/data/conversation/message/ViewableConversationMessage.class.php
@@ -1,49 +1,47 @@
 <?php
 namespace wcf\data\conversation\message;
-use wcf\data\user\User;
 use wcf\data\user\UserProfile;
-use wcf\data\user\UserProfileCache;
 use wcf\data\DatabaseObjectDecorator;
 use wcf\data\TLegacyUserPropertyAccess;
+use wcf\system\cache\runtime\UserProfileRuntimeCache;
 
 /**
  * Represents a viewable conversation message.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf.conversation
- * @subpackage	data.conversation.message
- * @category	Community Framework
+ * @package	WoltLabSuite\Core\Data\Conversation\Message
+ * 
+ * @method	ConversationMessage	getDecoratedObject()
+ * @mixin	ConversationMessage
  */
 class ViewableConversationMessage extends DatabaseObjectDecorator {
 	use TLegacyUserPropertyAccess;
 	
 	/**
-	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
+	 * @inheritDoc
 	 */
-	protected static $baseClass = 'wcf\data\conversation\message\ConversationMessage';
+	protected static $baseClass = ConversationMessage::class;
 	
 	/**
 	 * user profile object
-	 * @var	\wcf\data\user\UserProfile
+	 * @var	UserProfile
 	 */
 	protected $userProfile = null;
 	
 	/**
 	 * Returns the user profile object.
 	 * 
-	 * @return	\wcf\data\user\UserProfile
+	 * @return	UserProfile
 	 */
 	public function getUserProfile() {
 		if ($this->userProfile === null) {
 			if ($this->userID) {
-				$this->userProfile = UserProfileCache::getInstance()->getUserProfile($this->userID);
+				$this->userProfile = UserProfileRuntimeCache::getInstance()->getObject($this->userID);
 			}
 			else {
-				$this->userProfile = new UserProfile(new User(null, array(
-					'username' => $this->username
-				)));
+				$this->userProfile = UserProfile::getGuestUserProfile($this->username);
 			}
 		}
 		
@@ -54,11 +52,11 @@ class ViewableConversationMessage extends DatabaseObjectDecorator {
 	 * Returns the viewable conversation message with the given id.
 	 * 
 	 * @param	integer		$messageID
-	 * @return	\wcf\data\conversation\message\ViewableConversationMessage
+	 * @return	ViewableConversationMessage
 	 */
 	public static function getViewableConversationMessage($messageID) {
 		$messageList = new ViewableConversationMessageList();
-		$messageList->setObjectIDs(array($messageID));
+		$messageList->setObjectIDs([$messageID]);
 		$messageList->readObjects();
 		
 		return $messageList->search($messageID);