Merge branch '5.2'

diff --cc com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
index 9d1f824d75ceee8764ad23e80df7f0b5ea8c47fb,4343043bfbc99c7a0d03c3d267647133ff454353..41cc158f25165d7e3f4379c259b8577b054b4f98
--- 1/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
--- 2/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
+++ b/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
@@@ -1,8 -1,8 +1,8 @@@
- <div id="attachmentVideo_{@$attachmentIdentifier}" class="videoContainer" style="display: none;">
+ <span id="attachmentVideo_{@$attachmentIdentifier}" class="videoContainer" style="display: none;">
 -      <video src="{link controller='Attachment' object=$attachment}{/link}" controls></video>
 +      <video src="{$attachment->getLink()}" controls></video>
- </div>
+ </span>
  
 -<a id="attachmentVideoLink_{@$attachmentIdentifier}" href="{link controller='Attachment' object=$attachment}{/link}">{$attachment->filename}</a>
 +<a id="attachmentVideoLink_{@$attachmentIdentifier}" href="{$attachment->getLink()}">{$attachment->filename}</a>
  
  <script data-relocate="true">
        {* try to determine if browser might be able to play video *}