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

[5.1] upmerge 2023-12-21 #42556

Merged
merged 5 commits into from
Dec 21, 2023
Merged

Conversation

Razzo1987
Copy link
Contributor

Upmerge from 5.0 to 5.1

Elfangor93 and others added 4 commits December 19, 2023 09:25
…uninstall (joomla#42533)

* fix issue by checking if is_file()

Before calling File::delete(), the file path gets checked for existence with the PHP build in function is_file(). Only if the provided path is an existing file, it gets deleted using File::delete().

* remove \ for consistency
…as found which doesn't fulfil PHP or DB requirements (joomla#42489)

* Add information on reasons if no suitable update was found

* Change technical requirements link

* PHP CS

Co-authored-by: Quy <quy@nomonkeybiz.com>

* Apply suggestion from code review

Co-authored-by: Quy <quy@nomonkeybiz.com>

* Better English (1)

Co-authored-by: Brian Teeman <brian@teeman.net>

* Better English (2)

Co-authored-by: Brian Teeman <brian@teeman.net>

---------
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-5.1-dev labels Dec 21, 2023
@Razzo1987 Razzo1987 marked this pull request as ready for review December 21, 2023 15:56
@Razzo1987 Razzo1987 merged commit f093ff9 into joomla:5.1-dev Dec 21, 2023
2 checks passed
@Razzo1987 Razzo1987 added this to the Joomla! 5.1.0 milestone Jan 5, 2024
@Razzo1987 Razzo1987 deleted the 5.1/upmerge/2023-12-21 branch January 27, 2024 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators PR-5.1-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants