From 0b7dd5e315bef93a149bdbad370c45b581b3692a Mon Sep 17 00:00:00 2001 From: BrianTeeman Date: Mon, 13 Oct 2025 14:35:57 +0100 Subject: [PATCH 1/5] [6.1] Meaningful uninstall message --- .../components/com_installer/src/Model/ManageModel.php | 2 +- administrator/language/en-GB/com_installer.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php index 1a4ef51a165a7..469fdaef75adb 100644 --- a/administrator/components/com_installer/src/Model/ManageModel.php +++ b/administrator/components/com_installer/src/Model/ManageModel.php @@ -269,7 +269,7 @@ public function remove($eid = []) } // Package uninstalled successfully - $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype); + $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype, $row->name); $result = true; continue; diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini index f93f2d1d4e51f..7fda8f6bdf7ef 100644 --- a/administrator/language/en-GB/com_installer.ini +++ b/administrator/language/en-GB/com_installer.ini @@ -256,7 +256,7 @@ COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package." COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the Joomla! Update component to update Joomla." COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s." COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1$s\" (ID %2$s) is locked and cannot be uninstalled." -COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful." +COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %1$s %2$s was successful." COM_INSTALLER_UNPACK_ERROR="Failed to extract file: %s" COM_INSTALLER_UPDATE_ERROR="Error updating: %1$s
%2$s
%3$s
" COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for an update ID, update site ID or extension ID." From 18dd6798b7c8fa221392b0b3030241b646a6ed07 Mon Sep 17 00:00:00 2001 From: BrianTeeman Date: Mon, 13 Oct 2025 21:12:50 +0100 Subject: [PATCH 2/5] system tests --- .../administrator/components/com_installer/FromUrl.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js b/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js index 7a8a4e1e9c825..f32088dcb4390 100644 --- a/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js +++ b/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js @@ -25,6 +25,6 @@ describe('Test in backend that the Installer', () => { cy.contains('Uninstall').click(); cy.clickDialogConfirm(true); // Check if the uninstallation was successful - cy.contains('Uninstalling the component was successful'); + cy.contains('Uninstalling the component com_patchtester was successful.'); }); }); From 68d85a650e92cad60c72e5fc0824da669389a9df Mon Sep 17 00:00:00 2001 From: BrianTeeman Date: Tue, 14 Oct 2025 10:25:54 +0100 Subject: [PATCH 3/5] add uninstall --- .../components/com_installer/src/Model/ManageModel.php | 6 +++--- administrator/language/en-GB/com_installer.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php index 469fdaef75adb..1978c96c9a4e0 100644 --- a/administrator/components/com_installer/src/Model/ManageModel.php +++ b/administrator/components/com_installer/src/Model/ManageModel.php @@ -258,12 +258,12 @@ public function remove($eid = []) } if ($row->type) { - $result = $installer->uninstall($row->type, $id); + // $result = $installer->uninstall($row->type, $id); // Build an array of extensions that failed to uninstall if ($result === false) { // There was an error in uninstalling the package - $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype); + $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype, $row->name); continue; } @@ -276,7 +276,7 @@ public function remove($eid = []) } // There was an error in uninstalling the package - $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype); + $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype, $row->name); } $msg = implode('
', $msgs); diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini index 7fda8f6bdf7ef..de93ad0714eae 100644 --- a/administrator/language/en-GB/com_installer.ini +++ b/administrator/language/en-GB/com_installer.ini @@ -254,7 +254,7 @@ COM_INSTALLER_TYPE_TYPE_PLUGIN="plugin" COM_INSTALLER_TYPE_TYPE_TEMPLATE="template" COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package." COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the Joomla! Update component to update Joomla." -COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s." +COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %1$s %2$s." COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1$s\" (ID %2$s) is locked and cannot be uninstalled." COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %1$s %2$s was successful." COM_INSTALLER_UNPACK_ERROR="Failed to extract file: %s" From 07928a8536b6a8c1d3820beaebb5cfaf7841e5ff Mon Sep 17 00:00:00 2001 From: BrianTeeman Date: Tue, 14 Oct 2025 10:26:30 +0100 Subject: [PATCH 4/5] remove debug --- .../components/com_installer/src/Model/ManageModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php index 1978c96c9a4e0..75b01423b6922 100644 --- a/administrator/components/com_installer/src/Model/ManageModel.php +++ b/administrator/components/com_installer/src/Model/ManageModel.php @@ -258,7 +258,7 @@ public function remove($eid = []) } if ($row->type) { - // $result = $installer->uninstall($row->type, $id); + $result = $installer->uninstall($row->type, $id); // Build an array of extensions that failed to uninstall if ($result === false) { From 1bc07debe5c73777be17d39627b8b02bf7e51b9a Mon Sep 17 00:00:00 2001 From: BrianTeeman Date: Tue, 14 Oct 2025 10:34:17 +0100 Subject: [PATCH 5/5] cs --- .../components/com_installer/src/Model/ManageModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php index 75b01423b6922..8ac385f59e02e 100644 --- a/administrator/components/com_installer/src/Model/ManageModel.php +++ b/administrator/components/com_installer/src/Model/ManageModel.php @@ -258,7 +258,7 @@ public function remove($eid = []) } if ($row->type) { - $result = $installer->uninstall($row->type, $id); + $result = $installer->uninstall($row->type, $id); // Build an array of extensions that failed to uninstall if ($result === false) {