Incorrect recognition of legacy attachment widths

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 85546348908ce1a3c83b4ccf2f8a72b88fae5fa1..9c4b1046495914b6807a38824ebaeb5419ca1af0 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -237,6 +237,7 @@
                                woltlab: {
                                        allowImages: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('img')}true{else}false{/if},
                                        attachments: (elDataBool(element, 'disable-attachments') === false),
+                                       attachmentThumbnailWidth: {@ATTACHMENT_THUMBNAIL_WIDTH},
                                        autosave: autosave,
                                        allowedInlineStyles: allowedInlineStyles,
                                        buttons: buttonOptions,

diff --git a/wcfsetup/install/files/js/WCF.Attachment.js b/wcfsetup/install/files/js/WCF.Attachment.js
index 031726505900541598fc4cf2983084d582b88ff5..d170624e2171c61fb039f547063ba8c4cfd168ef 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Attachment.js
+++ b/wcfsetup/install/files/js/WCF.Attachment.js
@@ -131,8 +131,10 @@ WCF.Attachment.Upload = WCF.Upload.extend({
                                var images = this._getImageAttachments();
                                var attachmentId = data.attributes[0] || 0;
                                if (images.hasOwnProperty(attachmentId)) {
+                                       var thumbnailWidth = ~~$('#' + this._editorId).data('redactor').opts.woltlab.attachmentThumbnailWidth;
+                                       
                                        var thumbnail = data.attributes[2];
-                                       thumbnail = (thumbnail === true || thumbnail === 'true' || ~~thumbnail > 0);
+                                       thumbnail = (thumbnail === true || thumbnail === 'true' || ~~thumbnail <= thumbnailWidth);
                                        
                                        var image = elCreate('img');
                                        image.className = 'woltlabAttachment';