Skip to content

Commit a6d93be

Browse files
authored
[6.0] Update deleted files and folders in script.php to the changes from PR 45875 (joomla#46112)
* Add deleted files and folders from PR joomla#45875 * Revert folder which will be needed for 6.0 * Remove exclusions for 5.4 guided tours language files
1 parent 49acf55 commit a6d93be

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

administrator/components/com_admin/script.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,17 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
990990
'/media/templates/site/cassiopeia/css/global/font_advanced.min.css.gz',
991991
'/media/templates/site/cassiopeia/scss/global/colors_custom.scss',
992992
'/media/templates/site/cassiopeia/scss/global/font_advanced.scss',
993+
// From 6.0.0-beta3 to 6.0.0-rc1
994+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2.ini',
995+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2_steps.ini',
996+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3.ini',
997+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini',
998+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini',
999+
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini',
1000+
'/media/com_guidedtours/images/5_2/enhancedtourheader.png',
1001+
'/media/com_guidedtours/images/5_2/mailtemplate.png',
1002+
'/media/com_guidedtours/images/5_3/filesdirectory.jpg',
1003+
'/media/com_guidedtours/images/5_4/automated-updates.jpg',
9931004
];
9941005

9951006
$folders = [
@@ -1041,6 +1052,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
10411052
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector',
10421053
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Common',
10431054
'/libraries/src/Adapter',
1055+
// From 6.0.0-beta3 to 6.0.0-rc1
1056+
'/media/com_guidedtours/images/5_4',
1057+
'/media/com_guidedtours/images/5_3',
1058+
'/media/com_guidedtours/images/5_2',
10441059
];
10451060

10461061
$status['files_checked'] = $files;

build/deleted_file_check.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ function usage($command)
145145
// Specific files (e.g. language files) that we want to keep on upgrade
146146
$filesToKeep = [
147147
// Example: "'/administrator/language/en-GB/en-GB.com_search.ini',",
148-
"'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini',",
149-
"'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini',",
150148
"'/administrator/language/en-GB/plg_behaviour_compat.ini',",
151149
"'/administrator/language/en-GB/plg_behaviour_compat.sys.ini',",
152150
];

0 commit comments

Comments
 (0)