Update to changes from 4.2.0-beta1

richard67 · Jun 19, 2022 · b276695 · b276695
1 parent f510ff0
commit b276695
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/administrator/components/com_admin/src/Script/DeletedFiles.php b/administrator/components/com_admin/src/Script/DeletedFiles.php
@@ -5833,12 +5833,32 @@ class DeletedFiles
 		'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/TracedStatementTest.php',
 		'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/full_init.html',
 		'/libraries/vendor/maximebf/debugbar/tests/bootstrap.php',
-		// From 4.1 to 4.2.0
+		// From 4.1 to 4.2.0-beta1
 		'/libraries/src/Service/Provider/ApiRouter.php',
 		'/libraries/vendor/nyholm/psr7/doc/final.md',
+		'/media/com_finder/js/index-es5.js',
+		'/media/com_finder/js/index-es5.min.js',
+		'/media/com_finder/js/index-es5.min.js.gz',
+		'/media/com_finder/js/index.js',
+		'/media/com_finder/js/index.min.js',
+		'/media/com_finder/js/index.min.js.gz',
+		'/media/com_users/js/two-factor-switcher-es5.js',
+		'/media/com_users/js/two-factor-switcher-es5.min.js',
+		'/media/com_users/js/two-factor-switcher-es5.min.js.gz',
+		'/media/com_users/js/two-factor-switcher.js',
+		'/media/com_users/js/two-factor-switcher.min.js',
+		'/media/com_users/js/two-factor-switcher.min.js.gz',
 		'/modules/mod_articles_news/mod_articles_news.php',
+		'/plugins/actionlog/joomla/joomla.php',
 		'/plugins/api-authentication/basic/basic.php',
 		'/plugins/api-authentication/token/token.php',
 		'/plugins/system/cache/cache.php',
+		'/plugins/twofactorauth/totp/postinstall/actions.php',
+		'/plugins/twofactorauth/totp/tmpl/form.php',
+		'/plugins/twofactorauth/totp/totp.php',
+		'/plugins/twofactorauth/totp/totp.xml',
+		'/plugins/twofactorauth/yubikey/tmpl/form.php',
+		'/plugins/twofactorauth/yubikey/yubikey.php',
+		'/plugins/twofactorauth/yubikey/yubikey.xml',
 	];
 }
diff --git a/administrator/components/com_admin/src/Script/DeletedFolders.php b/administrator/components/com_admin/src/Script/DeletedFolders.php
@@ -1375,9 +1375,13 @@ class DeletedFolders
 		'/libraries/vendor/maximebf/debugbar/demo/bridge',
 		'/libraries/vendor/maximebf/debugbar/demo',
 		'/libraries/vendor/maximebf/debugbar/build',
-		// From 4.1 to 4.2.0
-		'/libraries/vendor/nyholm/psr7/doc',
-		'/plugins/twofactorauth/totp',
+		// From 4.1 to 4.2.0-beta1
+		'/plugins/twofactorauth/yubikey/tmpl',
 		'/plugins/twofactorauth/yubikey',
+		'/plugins/twofactorauth/totp/tmpl',
+		'/plugins/twofactorauth/totp/postinstall',
+		'/plugins/twofactorauth/totp',
+		'/plugins/twofactorauth',
+		'/libraries/vendor/nyholm/psr7/doc',
 	];
 }