Skip to content
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.

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

[4.0] Remove _com_joomlaupdate.scss from deleted files in script.php #36161

Conversation

richard67
Copy link
Member

Pull Request for Issue # .

Summary of Changes

With PR #34407 file "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" has been removed from the sources, and so it has been added to section "// 4.0 from RC 1 to RC 2" of the list of files to be deleted on update in script.php .

Later with PR #35076 (same author as the previously mentioned PR), the file was added back, but it has not been removed from script.php, and the "build/deleted_file_check.php" can't know that and will always add it back when creating the list and comparing 4.0 RC 1 and RC 2.

That means on each core update of J4, the file will be deleted.

This PR here fixes this by removing the file from the list of files to be deleted in script.php.

It would also need to add it to the list of files to be kept in "build/deleted_file_check.php" so the tool will not add it back when rebuilding the complete list from scratch.

But in 4.1 the scss file has to be added back to the list in script.php because it will be moved to the media folder due to the child template change.

This means that the the change in "build/deleted_file_check.php" in the 4.0-dev branch would have to be reverted in the 4.10-dev branch, or in other words, the 4.0-dev branch and the 4.1-dev branch would have different versions of "build/deleted_file_check.php".

I want to avoid this and so I don't change "build/deleted_file_check.php" with this PR here.

As I'm the one who currently maintains the files and folders deletion in script.php, I will add information on that to my documentation here richard67#20 .

Testing Instructions

Code review.

Actual result BEFORE applying this Pull Request

File "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" is deleted when updating from 4.0.x to 4.0.y.

Expected result AFTER applying this Pull Request

File "administrator/templates/atum/scss/pages/_com_joomlaupdate.scss" is not deleted when updating from 4.0.x to 4.0.y.

Documentation Changes Required

None.

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on bf42d29


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

1 similar comment
@alikon
Copy link
Contributor

alikon commented Nov 30, 2021

I have tested this item ✅ successfully on bf42d29


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

@alikon
Copy link
Contributor

alikon commented Nov 30, 2021

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36161.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Nov 30, 2021
@richard67 richard67 added this to the Joomla 4.0.5 milestone Nov 30, 2021
@richard67
Copy link
Member Author

Ping @wilsonge :-)

@wilsonge wilsonge merged commit c4e1905 into joomla:4.0-dev Nov 30, 2021
@wilsonge
Copy link
Contributor

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants