Merge remote-tracking branch 'origin/6.0' into image-center

# Conflicts:
#	com.woltlab.wcf/templates/mediaBBCodeTag.tpl
#	wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
#	wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php

Author: Cyperghost

com.woltlab.wcf/bbcode.xml

@@ -192,6 +192,9 @@
 				<attribute name="2">
 					<validationpattern><![CDATA[^(left|right|center|none)$]]></validationpattern>
 				</attribute>
+				<attribute name="3">
+					<validationpattern><![CDATA[^\d+$]]></validationpattern>
+				</attribute>
 			</attributes>
 		</bbcode>
 		<bbcode name="wsp">

com.woltlab.wcf/templates/mediaBBCodeTag.tpl

@@ -1,6 +1,6 @@
 {if !$removeLinks|isset}{assign var='removeLinks' value=false}{/if}
 {if $float === 'center'}<p class="text-center">{/if}
-<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
+<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}"{if $width !== 'auto'} style="width: {$width}px; display: inline-flex"{/if}>
 	{if $media->isImage}
 		{if $thumbnailSize != 'original'}
 			{if !$removeLinks}

wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl

@@ -1,6 +1,6 @@
 {if !$removeLinks|isset}{assign var='removeLinks' value=false}{/if}
 {if $float === 'center'}<p class="text-center">{/if}
-<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}">
+<span class="mediaBBCode{if $float != 'none'} messageFloatObject{$float|ucfirst}{/if}"{if $width !== 'auto'} style="width: {$width}px; display: inline-flex"{/if}>
 	{if $media->isImage}
 		{if $thumbnailSize != 'original'}
 			{if !$removeLinks}

wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php

@@ -109,7 +109,7 @@ private function showImage(Attachment $attachment, string $outputType, array $at
             );
         } else {
             $result = \sprintf(
-                '<span title="%s" class="%s" style="width: %s">%s</span>',
+                '<span title="%s" class="%s" style="width: %s; display: inline-flex;">%s</span>',
                 $title,
                 $class,
                 $width,
@@ -174,7 +174,7 @@ private function showImageAsThumbnail(Attachment $attachment, string $alignment,
             );
         } else {
             $result = \sprintf(
-                '<span class="%s" stlye="width: %s">%s%s</span>',
+                '<span class="%s" style="width: %s; display: inline-flex">%s%s</span>',
                 $class,
                 $width,
                 $imageElement,

wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaBBCode.class.php

@@ -60,6 +60,7 @@ public function getParsedTag(array $openingTag, $content, array $closingTag, BBC
                 if ($media->isImage) {
                     $thumbnailSize = (!empty($openingTag['attributes'][1])) ? $openingTag['attributes'][1] : 'original';
                     $float = (!empty($openingTag['attributes'][2])) ? $openingTag['attributes'][2] : 'none';
+                    $width = (!empty($openingTag['attributes'][3])) ? $openingTag['attributes'][3] : 'auto';
 
                     return WCF::getTPL()->fetch('mediaBBCodeTag', 'wcf', [
                         'mediaLink' => $this->getLink($media),
@@ -71,6 +72,7 @@ public function getParsedTag(array $openingTag, $content, array $closingTag, BBC
                         'float' => $float,
                         'media' => $media->getLocalizedVersion(MessageEmbeddedObjectManager::getInstance()->getActiveMessageLanguageID()),
                         'thumbnailSize' => $thumbnailSize,
+                        'width' => $width,
                     ]);
                 } elseif ($media->isVideo() || $media->isAudio()) {
                     return WCF::getTPL()->fetch('mediaBBCodeTag', 'wcf', [

wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php

@@ -164,6 +164,12 @@ protected function handleMedium(\DOMElement $element, $class)
 
         $float = 'none';
         $thumbnail = 'original';
+        $width = $element->getAttribute("data-width");
+        if (\preg_match('~(?<width>\d+)px$~', $width, $matches)) {
+            $width = (int)$matches['width'];
+        } else {
+            $width = "auto";
+        }
 
         if (
             \preg_match(
@@ -192,6 +198,7 @@ protected function handleMedium(\DOMElement $element, $class)
             $mediumID,
             $thumbnail,
             $float,
+            $width,
         ];
 
         $newElement = $element->ownerDocument->createElement('woltlab-metacode');