Merge branch 'develop' into 4.8

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Fixed a bug where layout components provided by disabled plugins weren’t getting omitted. ([#14236](https://github.com/craftcms/cms/pull/14236))
 - Fixed a bug where “Move to the left” and “Move to the right” actions within field layout designers weren’t always getting enabled when they should, if a new tab was added.
 - Fixed a bug where “Move to the left” and “Move to the right” actions within field layout designers were labelled incorrectly for right-to-left languages.
+- Fixed a bug where users with “Create entries” permission but not “Delete entries” weren’t allowed to delete their own unpublished drafts. ([#14294](https://github.com/craftcms/cms/issues/14294))
 
 ## 4.7.1 - 2024-01-29
 

src/base/ApplicationTrait.php

@@ -45,6 +45,7 @@
 use craft\i18n\Formatter;
 use craft\i18n\I18N;
 use craft\i18n\Locale;
+use craft\log\Dispatcher;
 use craft\mail\Mailer;
 use craft\markdown\GithubMarkdown;
 use craft\markdown\Markdown;
@@ -199,6 +200,7 @@
  * @property-read string $installedSchemaVersion The installed schema version
  * @method AssetManager getAssetManager() Returns the asset manager component.
  * @method Connection getDb() Returns the database connection component.
+ * @method Dispatcher getLog() Returns the log dispatcher component.
  * @method Formatter getFormatter() Returns the formatter component.
  * @method I18N getI18n() Returns the internationalization (i18n) component.
  * @method Security getSecurity() Returns the security component.

src/elements/Entry.php

@@ -1438,7 +1438,7 @@ public function canDelete(User $user): bool
             return true;
         }
 
-        if ($this->getIsDraft() && $this->getIsDerivative()) {
+        if ($this->getIsDraft()) {
             /** @var static|DraftBehavior $this */
             return (
                 $this->creatorId === $user->id ||

src/services/Assets.php

@@ -350,7 +350,7 @@ public function deleteFoldersByIds(int|array $folderIds, bool $deleteDir = true)
      * @param array $volumeIds
      * @param array $additionalCriteria additional criteria for filtering the tree
      * @return array
-     * @deprecated in 4.4.0d
+     * @deprecated in 4.4.0
      */
     public function getFolderTreeByVolumeIds(array $volumeIds, array $additionalCriteria = []): array
     {

src/services/ImageTransforms.php

@@ -49,17 +49,17 @@
 class ImageTransforms extends Component
 {
     /**
-     * @event AssetTransformEvent The event that is triggered before an asset transform is saved
+     * @event AssetTransformEvent The event that is triggered before an image transform is saved
      */
     public const EVENT_BEFORE_SAVE_IMAGE_TRANSFORM = 'beforeSaveImageTransform';
 
     /**
-     * @event AssetTransformEvent The event that is triggered after an asset transform is saved
+     * @event AssetTransformEvent The event that is triggered after an image transform is saved
      */
     public const EVENT_AFTER_SAVE_IMAGE_TRANSFORM = 'afterSaveImageTransform';
 
     /**
-     * @event AssetTransformEvent The event that is triggered before an asset transform is deleted
+     * @event AssetTransformEvent The event that is triggered before an image transform is deleted
      */
     public const EVENT_BEFORE_DELETE_IMAGE_TRANSFORM = 'beforeDeleteImageTransform';
 
@@ -69,12 +69,12 @@ class ImageTransforms extends Component
     public const EVENT_BEFORE_APPLY_TRANSFORM_DELETE = 'beforeApplyTransformDelete';
 
     /**
-     * @event AssetTransformEvent The event that is triggered after an asset transform is deleted
+     * @event AssetTransformEvent The event that is triggered after an image transform is deleted
      */
     public const EVENT_AFTER_DELETE_IMAGE_TRANSFORM = 'afterDeleteImageTransform';
 
     /**
-     * @event AssetEvent The event that is triggered when a transform is being generated for an Asset.
+     * @event AssetEvent The event that is triggered before a transform is deleted for an Asset.
      */
     public const EVENT_BEFORE_INVALIDATE_ASSET_TRANSFORMS = 'beforeInvalidateAssetTransforms';