admin can always delete attachments (unless they are private)

diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
index 5be8905821ab52607a9f32284da39943903d18cd..ba95255583424a879d0991aef34353beb042e9fd 100644 (file)
--- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
@@ -72,7 +72,10 @@ class AttachmentAction extends AbstractDatabaseObjectAction implements ISortable
                                }
                        }
                        else if (!$attachment->canDelete()) {
-                               throw new PermissionDeniedException();
+                               // admin can always delete attachments (unless they are private)
+                               if (!WCF::getSession()->getPermission('admin.attachment.canManageAttachment') || ObjectTypeCache::getInstance()->getObjectType($attachment->objectTypeID)->private) {
+                                       throw new PermissionDeniedException();
+                               }
                        }
                }
        }