Skip to content

[4.2] Update deleted files and folders for 4.2.0-beta3 #38155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 3, 2022
Merged

[4.2] Update deleted files and folders for 4.2.0-beta3 #38155

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8007628
Add deleted file from PR #38098
richard67 Jun 27, 2022
d90b64d
Merge tag 'psr12anchor' into psr12/merge/38155
HLeithner Jun 27, 2022
b220ca5
Phase 1 convert BRANCH to PSR-12
HLeithner Jun 27, 2022
cfcf1bb
Merge tag 'psr12final' into psr12/merge/38155
HLeithner Jun 27, 2022
acf1f5d
Merge pull request #29 from HLeithner/psr12/merge/38155
richard67 Jun 27, 2022
ad2568c
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jun 27, 2022
2d4cb7f
Add deleted files and folders from PR #37910
richard67 Jun 28, 2022
8a59970
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jul 3, 2022
3127c8f
Add deleted file from PR #38072
richard67 Jul 3, 2022
9ad48fb
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6428,6 +6428,13 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/plugins/task/requests/requests.php',
'/plugins/task/sitestatus/sitestatus.php',
'/plugins/user/profile/src/Field/DobField.php',
// From 4.2.0-beta2 to 4.2.0-beta3
'/plugins/system/webauthn/src/Exception/AjaxNonCmsAppException.php',
'/plugins/system/webauthn/src/Helper/CredentialsCreation.php',
'/plugins/system/webauthn/src/Helper/Joomla.php',
'/plugins/system/webauthn/webauthn.php',
'/plugins/task/checkfiles/checkfiles.php',
'/plugins/task/demotasks/demotasks.php',
);

$folders = array(
Expand Down Expand Up @@ -7792,6 +7799,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
// From 4.2.0-beta1 to 4.2.0-beta2
'/layouts/plugins/user/profile/fields',
'/layouts/plugins/user/profile',
// From 4.2.0-beta2 to 4.2.0-beta3
'/plugins/system/webauthn/src/Helper',
'/plugins/system/webauthn/src/Exception',
);

$status['files_checked'] = $files;
Expand Down