Skip to content

[4.2] Update deleted files and folders for 4.2.0-beta2 #38039

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 8 commits into from
Jun 20, 2022
Merged

[4.2] Update deleted files and folders for 4.2.0-beta2 #38039

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1d541b
Add deleted file from PR #37954
richard67 Jun 12, 2022
189027b
Add deleted files from PR's #37928 , #37929 and #37947
richard67 Jun 12, 2022
dccd09e
Add deleted files and folders from PR #38065
richard67 Jun 16, 2022
c7b2801
Fix forgotten section header for folders
richard67 Jun 16, 2022
ac3f439
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jun 16, 2022
a59ef13
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jun 19, 2022
72c3178
Add deleted file from PR #38097
richard67 Jun 20, 2022
b0764bb
Merge branch '4.2-dev' into 4.2-dev-update-deleted-files-and-folders-…
richard67 Jun 20, 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
11 changes: 11 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 @@ -6477,6 +6477,14 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/plugins/twofactorauth/yubikey/tmpl/form.php',
'/plugins/twofactorauth/yubikey/yubikey.php',
'/plugins/twofactorauth/yubikey/yubikey.xml',
// From 4.2.0-beta1 to 4.2.0-beta2
'/layouts/plugins/user/profile/fields/dob.php',
'/modules/mod_articles_latest/mod_articles_latest.php',
'/plugins/behaviour/taggable/taggable.php',
'/plugins/behaviour/versionable/versionable.php',
'/plugins/task/requests/requests.php',
'/plugins/task/sitestatus/sitestatus.php',
'/plugins/user/profile/src/Field/DobField.php',
);

$folders = array(
Expand Down Expand Up @@ -7838,6 +7846,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/plugins/twofactorauth/totp',
'/plugins/twofactorauth',
'/libraries/vendor/nyholm/psr7/doc',
// From 4.2.0-beta1 to 4.2.0-beta2
'/layouts/plugins/user/profile/fields',
'/layouts/plugins/user/profile',
);

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