Remove all references to MODULE_ATTACHMENT

Close  #3333

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 01befe972c09c9a91ed0ccb54d730c284e0372aa..865da65e58af31ac53a22107f013ff561cf2de27 100644 (file)
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -508,7 +508,6 @@
                <acpmenuitem name="wcf.acp.menu.link.attachment.list">
                        <controller>wcf\acp\page\AttachmentListPage</controller>
                        <parent>wcf.acp.menu.link.attachment</parent>
-                       <options>module_attachment</options>
                        <permissions>admin.attachment.canManageAttachment</permissions>
                </acpmenuitem>
                <!-- /attachment -->

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e742a96e200a0e4a03e723027d18aacc3cf83f0b..0b399cd8dea5e97e2b27c64e59c0804266fd6e85 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -221,7 +221,6 @@
                        </category>
                        <category name="message.attachment">
                                <parent>message</parent>
-                               <options>module_attachment</options>
                        </category>
                        <category name="message.attachment.autoscale">
                                <parent>message.attachment</parent>

diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index 58901643d72ed63ed753596e6183e216d968f7dc..618d2bc649b01ba134b93da6813bb052542fe8a1 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -5,7 +5,9 @@
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
                        {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a><span class="icon icon16 fa-smile-o"></span> <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
-                       {if MODULE_ATTACHMENT && !$attachmentHandler|empty && $attachmentHandler->canUpload()}<li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>{/if}
+                       {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
+                               <li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+                       {/if}
                        {if $__messageFormSettings}<li data-name="settings"><a><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
                        {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a><span class="icon icon16 fa-bar-chart"></span> <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
                        {event name='tabMenuTabs'}
@@ -13,7 +15,9 @@
        </nav>
        
        {if MODULE_SMILEY && !$smileyCategories|empty}{include file='messageFormSmilies'}{/if}
-       {if MODULE_ATTACHMENT && !$attachmentHandler|empty && $attachmentHandler->canUpload()}{include file='messageFormAttachments'}{/if}
+       {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
+               {include file='messageFormAttachments'}
+       {/if}
        
        {if $__messageFormSettings}{@$__messageFormSettings}{/if}
        {include file='__messageFormPoll'}

diff --git a/com.woltlab.wcf/templates/messageFormTabsInline.tpl b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
index 1211facae1a6b5fccaa567d865d198bf5b341450..4e3b62250a62a0aeda5f90d46baac6eb70eb21d3 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormTabsInline.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
@@ -9,7 +9,9 @@
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
                        {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a><span class="icon icon16 fa-smile-o"></span> <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
-                       {if MODULE_ATTACHMENT && !$attachmentHandler|empty && $attachmentHandler->canUpload()}<li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>{/if}
+                       {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
+                               <li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+                       {/if}
                        {if $__messageFormSettingsInlineContent}<li data-name="settings"><a><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
                        {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a><span class="icon icon16 fa-bar-chart"></span> <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
                        {event name='tabMenuTabs'}
@@ -17,7 +19,9 @@
        </nav>
        
        {if MODULE_SMILEY && !$smileyCategories|empty}{include file='messageFormSmilies'}{/if}
-       {if MODULE_ATTACHMENT && !$attachmentHandler|empty && $attachmentHandler->canUpload()}{include file='messageFormAttachments'}{/if}
+       {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
+               {include file='messageFormAttachments'}
+       {/if}
        
        {if $__messageFormSettingsInlineContent}{@$__messageFormSettingsInlineContent}{/if}
        

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index b90c6b7aa2c3f54f04d6e731469fae371ca2c4de..d99d4f700e4d3f733665e5341ae5e5e14136c63b 100644 (file)
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -471,7 +471,6 @@
                                <categoryname>admin.content</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
-                               <options>module_attachment</options>
                                <admindefaultvalue>1</admindefaultvalue>
                                <usersonly>1</usersonly>
                        </option>

diff --git a/wcfsetup/install/files/lib/form/MessageForm.class.php b/wcfsetup/install/files/lib/form/MessageForm.class.php
index 4f4b376a73dc74a07e31ca1ec7483f8d9a0032ea..cec85658747eb4e02b5568411e340754ddc8633d 100644 (file)
--- a/wcfsetup/install/files/lib/form/MessageForm.class.php
+++ b/wcfsetup/install/files/lib/form/MessageForm.class.php
@@ -270,7 +270,7 @@ abstract class MessageForm extends AbstractCaptchaForm {
         */
        public function readData() {
                // get attachments
-               if (MODULE_ATTACHMENT && $this->attachmentObjectType) {
+               if ($this->attachmentObjectType) {
                        $this->attachmentHandler = new AttachmentHandler($this->attachmentObjectType, $this->attachmentObjectID, $this->tmpHash, $this->attachmentParentObjectID);
                }
                

diff --git a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
index 0ba5658c1edc692fd212f0d6aae7fe1c799de7bc..81c62ce460f303efd5dd1528f19fbe8839ec70f9 100644 (file)
--- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
+++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
@@ -211,7 +211,7 @@ class QuickReplyManager extends SingletonFactory {
                $parameters['data'] = array_merge($additionalFields, $parameters['data']);
                
                // attachment support
-               if (MODULE_ATTACHMENT && !empty($parameters['tmpHash']) && $object instanceof IAttachmentMessageQuickReplyAction) {
+               if (!empty($parameters['tmpHash']) && $object instanceof IAttachmentMessageQuickReplyAction) {
                        $parameters['attachmentHandler'] = $object->getAttachmentHandler($this->container);
                }
                

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e474d2f8bcd11a6c3306d5a3e221fc98d2726b27..1fdcca215d4329037cf63b17b76ac3dd72d7b1bf 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1406,7 +1406,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
                <item name="wcf.acp.option.attachment_image_autoscale_file_type"><![CDATA[Dateityp]]></item>
                <item name="wcf.acp.option.attachment_image_autoscale_file_type.jpeg"><![CDATA[JPEG (verlustbehaftet, erzeugt in der Regel kleine Dateien)]]></item>
                <item name="wcf.acp.option.attachment_image_autoscale_file_type.keep"><![CDATA[Dateityp beibehalten]]></item>
-               <item name="wcf.acp.option.module_attachment"><![CDATA[Dateianhänge]]></item>
                <item name="wcf.acp.option.module_smiley"><![CDATA[Smileys]]></item>
                <item name="wcf.acp.option.category.message.censorship"><![CDATA[Zensur-Funktion]]></item>
                <item name="wcf.acp.option.censored_words"><![CDATA[Zu zensierende Wörter]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index edaa7ef1980724aee71eb5ced79a14afe7de9318..c7d74daae17abbb29a6fbe21fb36cf626d417099 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1383,7 +1383,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
                <item name="wcf.acp.option.attachment_image_autoscale_file_type"><![CDATA[File type]]></item>
                <item name="wcf.acp.option.attachment_image_autoscale_file_type.jpeg"><![CDATA[JPEG (lossy, usually the generated files are small)]]></item>
                <item name="wcf.acp.option.attachment_image_autoscale_file_type.keep"><![CDATA[Keep the file type]]></item>
-               <item name="wcf.acp.option.module_attachment"><![CDATA[Attachments]]></item>
                <item name="wcf.acp.option.module_smiley"><![CDATA[Smilies]]></item>
                <item name="wcf.acp.option.category.message.censorship"><![CDATA[Censorship]]></item>
                <item name="wcf.acp.option.censored_words"><![CDATA[Censored Words]]></item>