Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/mediaBBCodeTag.tpl
index ac0fc85d2439b61515b242312329239a131b6377,9d75f479d5aea1ac4ec349788dd4b203e9fb9d03..d198fba1703abc175aeba87436f688d1c80b7a80
--- 1/com.woltlab.wcf/templates/mediaBBCodeTag.tpl
--- 2/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 ac0fc85d2439b61515b242312329239a131b6377,9d75f479d5aea1ac4ec349788dd4b203e9fb9d03..d198fba1703abc175aeba87436f688d1c80b7a80
--- 1/wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
--- 2/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}

diff --cc wcfsetup/install/files/lib/data/comment/CommentAction.class.php
Simple merge