From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 31 Jul 2016 19:20:29 +0000 (+0200)
Subject: Improved simplified html message versions
X-Git-Tag: 3.0.0_Beta_1~831
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07030204771fc7656f647ea381866769c946ed25;p=GitHub%2FWoltLab%2FWCF.git

Improved simplified html message versions
---

diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl
index 361db5e946..291d73737b 100644
--- a/com.woltlab.wcf/templates/searchResultList.tpl
+++ b/com.woltlab.wcf/templates/searchResultList.tpl
@@ -20,13 +20,7 @@
 							{if $message->getUserProfile() || $message->getTime() || $message->getContainerTitle()}
 								<ul class="inlineList dotSeparated">
 									{if $message->getUserProfile()}
-										<li>
-											{if $message->getUserProfile()->userID}
-												<a href="{link controller='User' object=$message->getUserProfile()}{/link}" class="userLink" data-user-id="{@$message->getUserProfile()->userID}">{$message->getUserProfile()->username}</a>
-											{else}
-												{$message->getUserProfile()->username}
-											{/if}
-										</li>
+										<li>{if $message->getUserProfile()->userID}<a href="{link controller='User' object=$message->getUserProfile()}{/link}" class="userLink" data-user-id="{@$message->getUserProfile()->userID}">{$message->getUserProfile()->username}</a>{else}{$message->getUserProfile()->username}{/if}</li>
 									{/if}
 									{if $message->getTime()}
 										<li><small>{@$message->getTime()|time}</small></li>
diff --git a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
index b71cbbcc8f..9a0c672831 100644
--- a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
@@ -53,7 +53,7 @@ class AttachmentBBCode extends AbstractBBCode {
 		}
 		
 		if ($attachment !== null) {
-			if ($attachment->showAsImage() && $attachment->canViewPreview() && $parser->getOutputType() == 'text/html') {
+			if ($attachment->showAsImage() && $attachment->canViewPreview() && ($parser->getOutputType() == 'text/html' || $parser->getOutputType() == 'text/simplified-html')) {
 				// image
 				$alignment = (isset($openingTag['attributes'][1]) ? $openingTag['attributes'][1] : '');
 				$thumbnail = (isset($openingTag['attributes'][2]) ? $openingTag['attributes'][2] : false);
@@ -72,6 +72,11 @@ class AttachmentBBCode extends AbstractBBCode {
 					$thumbnail = true;
 				}
 				
+				// always use thumbnail in simplified version
+				if ($parser->getOutputType() == 'text/simplified-html') {
+					$thumbnail = true;
+				}
+				
 				// check if width is valid and the original is accessible by viewer
 				if (!$thumbnail && !$attachment->canDownload()) {
 					$thumbnail = false;