[5.1] Fix duplicate Brotli .htaccess postinstall message after update from 4.4#43182
Merged
LadySolveig merged 8 commits intojoomla:5.1-devfrom Apr 1, 2024
Merged
Conversation
brianteeman
reviewed
Mar 30, 2024
administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql
Outdated
Show resolved
Hide resolved
brianteeman
reviewed
Mar 30, 2024
administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql
Outdated
Show resolved
Hide resolved
brianteeman
reviewed
Mar 30, 2024
administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql
Show resolved
Hide resolved
Co-authored-by: Brian Teeman <brian@teeman.net>
Contributor
|
I have tested this item ✅ successfully on 5cc1632 Work as expected This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/43182. |
Contributor
|
I have tested this item ✅ successfully on 5cc1632 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/43182. |
Member
Author
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/43182. |
|
I have tested this item ✅ successfully on 5cc1632 I confirmed the BEFORE (2 notices) and AFTER (1 notice) situations. CentOS v7.9.2009 STANDARD kvm, This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/43182. |
2 tasks
…ready integrated into the .htaccess file. -> new installation of 4.4.4
…tall-message Prevent displaying the post-installation message
Contributor
|
Thank you @richard67 and also for testing @conseilgouz @Razzo1987 @exlemor |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
This pull request (PR) fixes the duplicate postinstall message for the Brotli .htaccess message which you get after updating from 4.4.3 or the latest 4.4 nightly build to the latest 5.1-dev nightly build.
INSERT IGNORE(MySQL and MariaDB) orON CONFLICT DO NOTHING(PostgreSQL) don't help here as we do not use thepostinstall_message_idcolumn in the inserts, and so no primary key or unique key would be violated when inserting multiple times.This PR fixes that by adding a condition for that to the
SELECTpart of theINSERT INTO .. SELECTstatement.For the reason mentioned above, it also removes the
IGNOREfrom the MySQL and theON CONFLICT DO NOTHINGfrom the PostgreSQL script.The duplicate happens when updating from 4.4.3 or any older 4.4.x because the 5.1.0 nightly package includes the
4.4.4-2024-03-28.sqlupdate SQL script from the latest upmerge, so that one and the one modified by this PR are run both.Depending on if we require to be on 4.4.4 for updating to 5.1 or if we allow updating to 5.1 also for older 4.4.x versions, we should remove the
4.4.4-2024-03-28.sqlupdate SQL script from the 5.1-dev branch and delete it on update, or we should not do that and keep it.Currently the target platform values of the 5.1.0 Beta targets in https://update.joomla.org/cms/targets.json only require to be on 4.4.x, they do not require 4.4.4. If we would require that, we would have to update the targetplatform of the 5.x versions with every new 4.4. version, and in future do the same with 6.x for every new 5.y.
So maybe we should not require the latest version and keep the
4.4.4-2024-03-28.sqlscript in 5.x-dev branches.I will clarify that with other maintainer and release managers.
@brianteeman Seems you were right with your worries.
Testing Instructions
Update from 4.4.3 or any older 4.4.x to the latest 5.1 nightly build for the actual result (you have to use "Upload & Update"), and update from 4.4.3 or any older 4.4.x to the patched update package or custom update URL created by Drone for this PR for the expected result.
The latest 5.1 nightly build can be downloaded from here: https://developer.joomla.org/nightlies/Joomla_5.1.0-beta3-dev-Development-Update_Package.zip
The patched update package or custom update URL created by Drone for this PR can be found here: https://artifacts.joomla.org/drone/joomla/joomla-cms/5.1-dev/43182/downloads/75140/
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Only one message.
Link to documentations
Please select:
No documentation changes for docs.joomla.org needed
No documentation changes for manual.joomla.org needed