Skip to content

Commit

Permalink
[BUGFIX] Pass new folder object in PostFolderRenameSignal
Browse files Browse the repository at this point in the history
The old folder object is already available in the PreFolderRenameSignal.
The new folder object is expected, similarly to the behaviour of the
corresponding PSR-14 middleware in TYPO3 v10 and up.

Releases: 9.5
Resolves: #92790
Related: #84539
Change-Id: I8b54d38343d6e686cf85b43243e641c080204e74
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66566
Tested-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Simon Gilli <typo3@gilbertsoft.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Simon Gilli <typo3@gilbertsoft.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
  • Loading branch information
xperseguers authored and lolli42 committed Nov 20, 2020
1 parent 4126ef1 commit a5bec18
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions typo3/sysext/core/Classes/Resource/ResourceStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -2280,7 +2280,7 @@ public function renameFolder($folderObject, $newName)
}
$returnObject = $this->getFolder($fileMappings[$folderObject->getIdentifier()]);

$this->emitPostFolderRenameSignal($folderObject, $returnObject->getName());
$this->emitPostFolderRenameSignal($folderObject, $returnObject->getName(), $returnObject);

return $returnObject;
}
Expand Down Expand Up @@ -2834,10 +2834,11 @@ protected function emitPreFolderRenameSignal(Folder $folder, $newName)
*
* @param Folder $folder
* @param string $newName
* @param Folder $newFolder
*/
protected function emitPostFolderRenameSignal(Folder $folder, $newName)
protected function emitPostFolderRenameSignal(Folder $folder, $newName, Folder $newFolder)
{
$this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderRename, [$folder, $newName]);
$this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderRename, [$folder, $newName, $newFolder]);
}

/**
Expand Down

0 comments on commit a5bec18

Please sign in to comment.