Skip to content

Commit 823a552

Browse files
committed
Fixed a couple typos
[ci skip]
1 parent f2786e7 commit 823a552

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/controllers/AssetsController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ public function actionMoveFolder(): Response
738738
$existingFolder = $targetVolume->directoryExists(rtrim($destinationFolder->path, '/') . '/' . $folderToMove->name);
739739
}
740740

741-
// If this a conflict and no force or merge flags were passed in then STOP RIGHT THERE!
741+
// If there's a conflict and `force`/`merge` flags weren't passed in, then STOP RIGHT THERE!
742742
if ($existingFolder && !$force && !$merge) {
743743
// Throw a prompt
744744
return $this->asJson([
@@ -790,7 +790,7 @@ public function actionMoveFolder(): Response
790790
$targetVolume->deleteDirectory(rtrim($destinationFolder->path, '/') . '/' . $folderToMove->name);
791791
}
792792

793-
// Mirror the structure, passing along the exsting folder map
793+
// Mirror the structure, passing along the existing folder map
794794
$folderIdChanges = Assets::mirrorFolderStructure($folderToMove, $destinationFolder, $targetTreeMap);
795795

796796
// Get file transfer list for the progress bar

src/helpers/Assets.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ public static function filename2Title(string $filename): string
259259
}
260260

261261
/**
262-
* Mirrors a folder structure on a volume.
262+
* Mirrors a folder structure within a volume.
263263
*
264-
* @param VolumeFolder $sourceParentFolder Folder who's children folder structure should be mirrored.
264+
* @param VolumeFolder $sourceParentFolder Folder whose nested folder structure should be mirrored.
265265
* @param VolumeFolder $destinationFolder The destination folder
266266
* @param array $targetTreeMap map of relative path => existing folder ID
267267
* @return array map of original folder ID => new folder ID

0 commit comments

Comments
 (0)