Skip to content

Commit 4d992e2

Browse files
authored
[4.0] Updating or uninstalling one library no longer removes another when both belong to same vendor. (#34954)
* [4.0] (#34910) Updating or uninstalling one library no longer removes another when both belong to same vendor. ### Summary of Changes Check if there are any other children before removing vendor folder. ### Testing instructions As described in #34910 * Added blank line for PHP code style error. * Removed the empty arrays for the last 2 parameters of Folder::folders() so the defaults are used As suggestion made in pull comment. * Removed unnecessary optional parameters from Folder::folders()
1 parent 4db6cc4 commit 4d992e2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

libraries/src/Installer/Adapter/LibraryAdapter.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,13 @@ protected function removeExtensionFiles()
309309
// Delete empty vendor folders
310310
if (2 === \count($elementParts))
311311
{
312-
Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]);
313-
Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]);
312+
$folders = Folder::folders(JPATH_PLATFORM . '/' . $elementParts[0]);
313+
314+
if (empty($folders))
315+
{
316+
Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]);
317+
Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]);
318+
}
314319
}
315320
}
316321

0 commit comments

Comments
 (0)