Update to changes from PRs joomla#40302 and joomla#41065

richard67 · Sep 4, 2023 · 5abe48d · 5abe48d
1 parent 4933366
commit 5abe48d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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',
     ];
 }