Skip to content

[4.3] Update deleted files list in script.php for upcoming 4.3.0-alpha2 #39401

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 9 commits into from
Dec 17, 2022
Merged

[4.3] Update deleted files list in script.php for upcoming 4.3.0-alpha2 #39401

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8a60b6
Adapt section comments to 4.3 in deleteUnexistingFiles
richard67 Dec 12, 2022
f36a89d
Add deleted files from PR's #38466 and #38470
richard67 Dec 12, 2022
3e60e5e
Add forgotten slashes
richard67 Dec 12, 2022
eea6085
Add deleted files from PR #39374
richard67 Dec 13, 2022
d208657
Merge branch '4.3-dev' into 4.3-dev-deleted-files-and-folders-2022-12-12
richard67 Dec 13, 2022
afa4981
Revert "Add deleted files from PR #39374"
richard67 Dec 16, 2022
a05a368
Remove js from PR #38823 from deleted files
richard67 Dec 16, 2022
d060af2
Merge branch '4.3-dev' into 4.3-dev-deleted-files-and-folders-2022-12-12
obuisard Dec 16, 2022
3204e2b
Merge branch '4.3-dev' into 4.3-dev-deleted-files-and-folders-2022-12-12
richard67 Dec 17, 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
17 changes: 7 additions & 10 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
];

$files = array(
// From 3.10 to 4.1
// From 3.10 to 4.3
'/administrator/components/com_actionlogs/actionlogs.php',
'/administrator/components/com_actionlogs/controller.php',
'/administrator/components/com_actionlogs/controllers/actionlogs.php',
Expand Down Expand Up @@ -6463,7 +6463,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/media/vendor/hotkeys.js/LICENSE',
// From 4.2.1 to 4.2.2
'/administrator/cache/fido.jwt',
// From 4.2 to 4.3
// From 4.2.5 to 4.3.0-alpha1
'/libraries/vendor/paragonie/sodium_compat/autoload-fast.php',
'/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php',
'/libraries/vendor/paragonie/sodium_compat/autoload-phpunit.php',
Expand All @@ -6475,12 +6475,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/media/com_menus/css/admin-item-edit_modules.css',
'/media/com_menus/css/admin-item-edit_modules.min.css',
'/media/com_menus/css/admin-item-edit_modules.min.css.gz',
'/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/templates/administrator/atum/scss/vendor/bootstrap/_bootstrap-rtl.scss',
'/media/templates/site/cassiopeia/scss/vendor/bootstrap/_bootstrap-rtl.scss',
'/plugins/content/confirmconsent/confirmconsent.php',
Expand All @@ -6493,10 +6487,13 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/plugins/quickicon/overridecheck/overridecheck.php',
'/plugins/quickicon/phpversioncheck/phpversioncheck.php',
'/plugins/quickicon/privacycheck/privacycheck.php',
// From 4.3.0-alpha1 to 4.3.0-alpha2
'/plugins/content/emailcloak/emailcloak.php',
'/plugins/content/fields/fields.php',
);

$folders = array(
// From 3.10 to 4.1
// From 3.10 to 4.3
'/templates/system/images',
'/templates/system/html',
'/templates/protostar/less',
Expand Down Expand Up @@ -7867,7 +7864,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/media/vendor/hotkeys.js/js',
'/media/vendor/hotkeys.js',
'/libraries/vendor/symfony/string/Resources/bin',
// From 4.2 to 4.3
// From 4.2.5 to 4.3.0-alpha1
'/libraries/vendor/paragonie/sodium_compat/dist',
);

Expand Down