From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 27 Jan 2019 14:12:00 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~344
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0161da48c7e4fa777f88ad837cbfa7098c960959;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

0161da48c7e4fa777f88ad837cbfa7098c960959
diff --cc com.woltlab.wcf/templates/mediaBBCodeTag.tpl
index ac0fc85d24,9d75f479d5..d198fba170
--- a/com.woltlab.wcf/templates/mediaBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/mediaBBCodeTag.tpl
@@@ -1,8 -1,8 +1,8 @@@
 -<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
 +<div class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
  	{if $thumbnailSize != 'original'}
- 		<a href="{$media->getLink()}" class="embeddedAttachmentLink jsImageViewer"><img src="{$media->getThumbnailLink($thumbnailSize)}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->getThumbnailWidth($thumbnailSize)}" data-height="{@$media->getThumbnailHeight($thumbnailSize)}"></a>
+ 		<a href="{$mediaLink}" class="embeddedAttachmentLink jsImageViewer"><img src="{$thumbnailLink}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->getThumbnailWidth($thumbnailSize)}" data-height="{@$media->getThumbnailHeight($thumbnailSize)}"></a>
  	{else}
- 		<img src="{$media->getLink()}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->width}" data-height="{@$media->height}">
+ 		<img src="{$mediaLink}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->width}" data-height="{@$media->height}">
  	{/if}
  	
  	{if $media->caption}
diff --cc wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
index ac0fc85d24,9d75f479d5..d198fba170
--- a/wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
@@@ -1,8 -1,8 +1,8 @@@
 -<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
 +<div class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
  	{if $thumbnailSize != 'original'}
- 		<a href="{$media->getLink()}" class="embeddedAttachmentLink jsImageViewer"><img src="{$media->getThumbnailLink($thumbnailSize)}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->getThumbnailWidth($thumbnailSize)}" data-height="{@$media->getThumbnailHeight($thumbnailSize)}"></a>
+ 		<a href="{$mediaLink}" class="embeddedAttachmentLink jsImageViewer"><img src="{$thumbnailLink}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->getThumbnailWidth($thumbnailSize)}" data-height="{@$media->getThumbnailHeight($thumbnailSize)}"></a>
  	{else}
- 		<img src="{$media->getLink()}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->width}" data-height="{@$media->height}">
+ 		<img src="{$mediaLink}" alt="{$media->altText}" title="{$media->title}" data-width="{@$media->width}" data-height="{@$media->height}">
  	{/if}
  	
  	{if $media->caption}