From 9fa42e337c8b6ef699b3bf998c42d5362cd8545d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Jul 2023 20:02:14 +0200 Subject: [PATCH] Update to changes from PRs #40302 and #41065 --- .../com_admin/src/Script/DeletedFiles.php | 18 ++++++++++++------ .../com_admin/src/Script/DeletedFolders.php | 6 ------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/administrator/components/com_admin/src/Script/DeletedFiles.php b/administrator/components/com_admin/src/Script/DeletedFiles.php index ac513a99a0974..48d89cc2c3539 100644 --- a/administrator/components/com_admin/src/Script/DeletedFiles.php +++ b/administrator/components/com_admin/src/Script/DeletedFiles.php @@ -322,6 +322,18 @@ class DeletedFiles '/libraries/vendor/web-auth/metadata-service/src/Version.php', '/libraries/vendor/web-auth/webauthn-lib/src/Server.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RSA.php', + '/media/com_templates/js/admin-template-compare-es5.js', + '/media/com_templates/js/admin-template-compare-es5.min.js', + '/media/com_templates/js/admin-template-compare-es5.min.js.gz', + '/media/com_templates/js/admin-template-compare.js', + '/media/com_templates/js/admin-template-compare.min.js', + '/media/com_templates/js/admin-template-compare.min.js.gz', + '/media/com_users/js/admin-users-mail-es5.js', + '/media/com_users/js/admin-users-mail-es5.min.js', + '/media/com_users/js/admin-users-mail-es5.min.js.gz', + '/media/com_users/js/admin-users-mail.js', + '/media/com_users/js/admin-users-mail.min.js', + '/media/com_users/js/admin-users-mail.min.js.gz', '/media/vendor/fontawesome-free/scss/_larger.scss', '/media/vendor/fontawesome-free/webfonts/fa-brands-400.eot', '/media/vendor/fontawesome-free/webfonts/fa-brands-400.svg', @@ -421,8 +433,6 @@ class DeletedFiles '/plugins/system/webauthn/src/Hotfix/FidoU2FAttestationStatementSupport.php', '/plugins/system/webauthn/src/Hotfix/Server.php', // From 5.0.0-alpha1 to 5.0.0-alpha2 - '/administrator/language/en-GB/plg_task_demotasks.ini', - '/administrator/language/en-GB/plg_task_demotasks.sys.ini', '/libraries/vendor/jfcherng/php-diff/src/languages/readme.txt', '/media/com_actionlogs/js/admin-actionlogs-default-es5.js', '/media/com_actionlogs/js/admin-actionlogs-default-es5.min.js', @@ -880,9 +890,5 @@ class DeletedFiles '/media/vendor/mediaelement/js/mediaelement-flash-video-mdash.swf', '/media/vendor/mediaelement/js/mediaelement-flash-video.swf', '/plugins/editors-xtd/pagebreak/pagebreak.php', - '/plugins/task/demotasks/demotasks.xml', - '/plugins/task/demotasks/forms/testTaskForm.xml', - '/plugins/task/demotasks/services/provider.php', - '/plugins/task/demotasks/src/Extension/DemoTasks.php', ]; } diff --git a/administrator/components/com_admin/src/Script/DeletedFolders.php b/administrator/components/com_admin/src/Script/DeletedFolders.php index c87e72007e26e..972e65de1b870 100644 --- a/administrator/components/com_admin/src/Script/DeletedFolders.php +++ b/administrator/components/com_admin/src/Script/DeletedFolders.php @@ -93,11 +93,5 @@ class DeletedFolders '/libraries/vendor/beberlei', '/administrator/components/com_admin/sql/others/mysql', '/administrator/components/com_admin/sql/others', - // From 5.0.0-alpha1 to 5.0.0-alpha2 - '/plugins/task/demotasks/src/Extension', - '/plugins/task/demotasks/src', - '/plugins/task/demotasks/services', - '/plugins/task/demotasks/forms', - '/plugins/task/demotasks', ]; }