Skip to content

[5.1] Fix duplicate Brotli .htaccess postinstall message after update from 4.4 #43182

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
LadySolveig merged 8 commits into from
Apr 1, 2024
Merged

[5.1] Fix duplicate Brotli .htaccess postinstall message after update from 4.4 #43182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8bf809d
Don't insert postinstall msg if it already exists
richard67 Mar 30, 2024
ef28843
No INSERT IGNORE/ON CONFLICT DO NOTHING
richard67 Mar 30, 2024
91da6b6
Add change comment
richard67 Mar 30, 2024
9249042
Add changes from review.
richard67 Mar 30, 2024
5cc1632
Merge branch '5.1-dev' into 5.1-dev-fix-duplicate-postinstall-message
richard67 Mar 30, 2024
a2a847b
Merge branch '5.1-dev' into 5.1-dev-fix-duplicate-postinstall-message
LadySolveig Apr 1, 2024
f1675bb
Prevent displaying the post-installation message if Brotli support al…
LadySolveig Apr 1, 2024
f4c69c7
Merge pull request #44 from LadySolveig/5.1-dev-fix-duplicate-postins…
richard67 Apr 1, 2024
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
8 changes: 7 additions & 1 deletion administrator/components/com_admin/postinstall/htaccessbrotli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,11 @@
*/
function admin_postinstall_htaccessbrotli_condition()
{
return true;
$htaccessContent = '';

if (is_file(JPATH_ROOT . '/.htaccess') || is_file(JPATH_ROOT . '/htaccess.txt')) {
$htaccessContent = file_get_contents(is_file(JPATH_ROOT . '/.htaccess') ? JPATH_ROOT . '/.htaccess' : JPATH_ROOT . '/htaccess.txt');
}

return !str_contains($htaccessContent, 'E=no-brotli:1');
}
11 changes: 9 additions & 2 deletions administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
--
-- Add post-installation message about Brotli compression in .htaccess
--
INSERT IGNORE INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
-- This statement had to be modified to prevent duplicate postinstall messages
-- when updating from 4.4.
-- See https://github.com/joomla/joomla-cms/pull/43182 for details.
--
INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1
FROM `#__extensions`
WHERE `name` = 'files_joomla'
AND (SELECT COUNT(a.`postinstall_message_id`) FROM `#__postinstall_messages` a WHERE a.`title_key` = 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE') = 0;
10 changes: 8 additions & 2 deletions administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
--
-- Add post-installation message about Brotli compression in .htaccess
--
-- This statement had to be modified to prevent duplicate postinstall messages
-- when updating from 4.4.
-- See https://github.com/joomla/joomla-cms/pull/43182 for details.
--
INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla'
ON CONFLICT DO NOTHING;
SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1
FROM "#__extensions"
WHERE "name" = 'files_joomla'
AND (SELECT COUNT(a."postinstall_message_id") FROM "#__postinstall_messages" a WHERE a."title_key" = 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE') = 0;