-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Update default plugin configs #20893
Conversation
installation/sql/mysql/joomla.sql
Outdated
(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 6, 0), | ||
(410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', '', 0, '0000-00-00 00:00:00', 1, 0), | ||
(410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":1,"lineWrapping":1,"matchTags":1,"matchBrackets":1,"marker-gutter":1,"autoCloseTags":1,"autoCloseBrackets":1,"autoFocus":1,"theme":"default","tabmode":"indent"}', '', '', 0, '0000-00-00 00:00:00', 1, 0), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Default should be 0 to match in XML:
lineNumbers
lineWrapping
marker-gutter (should be markerGutter)
No settings:
autoFocus
tabmode
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Existing SQL values should take priority over XML. Based on current values, all options should be enabled on new installations. I'll update #20544.
(418, 0, 'plg_search_contacts', 'plugin', 'contacts', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","search_content":"1","search_archived":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), | ||
(419, 0, 'plg_search_content', 'plugin', 'content', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","search_content":"1","search_archived":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), | ||
(420, 0, 'plg_search_newsfeeds', 'plugin', 'newsfeeds', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","search_content":"1","search_archived":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), | ||
(417, 0, 'plg_search_categories', 'plugin', 'categories', 'search', 0, 1, 1, 0, '', '{"search_limit":50,"search_content":1,"search_archived":1}', '', '', 0, '0000-00-00 00:00:00', 0, 0), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In XML files, search_content
and search_archived
are 0 except in plg_search_content
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated values in plugins.
installation/sql/mysql/joomla.sql
Outdated
(432, 0, 'plg_user_joomla', 'plugin', 'joomla', 'user', 0, 1, 1, 0, '', '{"autoregister":"1","mail_to_user":"1","forceLogout":"1"}', '', '', 0, '0000-00-00 00:00:00', 2, 0), | ||
(433, 0, 'plg_user_profile', 'plugin', 'profile', 'user', 0, 0, 1, 0, '', '{"register-require_address1":"1","register-require_address2":"1","register-require_city":"1","register-require_region":"1","register-require_country":"1","register-require_postal_code":"1","register-require_phone":"1","register-require_website":"1","register-require_favoritebook":"1","register-require_aboutme":"1","register-require_tos":"1","register-require_dob":"1","profile-require_address1":"1","profile-require_address2":"1","profile-require_city":"1","profile-require_region":"1","profile-require_country":"1","profile-require_postal_code":"1","profile-require_phone":"1","profile-require_website":"1","profile-require_favoritebook":"1","profile-require_aboutme":"1","profile-require_tos":"1","profile-require_dob":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), | ||
(433, 0, 'plg_user_profile', 'plugin', 'profile', 'user', 0, 0, 1, 0, '', '{"register-require_address1":1,"register-require_address2":1,"register-require_city":1,"register-require_region":1,"register-require_country":1,"register-require_postal_code":1,"register-require_phone":1,"register-require_website":1,"register-require_favoritebook":1,"register-require_aboutme":1,"register-require_tos":1,"register-require_dob":1,"profile-require_address1":1,"profile-require_address2":1,"profile-require_city":1,"profile-require_region":1,"profile-require_country":1,"profile-require_postal_code":1,"profile-require_phone":1,"profile-require_website":1,"profile-require_favoritebook":1,"profile-require_aboutme":1,"profile-require_tos":1,"profile-require_dob":1}', '', '', 0, '0000-00-00 00:00:00', 0, 0), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
register-require_tos is 0 in XML
@@ -613,7 +613,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem | |||
(448, 0, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), | |||
(449, 0, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), | |||
(450, 0, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), | |||
(451, 0, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), | |||
(451, 0, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":50,"show_tagged_items":1}', '', '', 0, '0000-00-00 00:00:00', 0, 0), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
show_tagged_items is 0 in XML
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated value in plugin.
plugins/user/profile/profile.php
Outdated
@@ -273,7 +273,7 @@ public function onContentPrepareForm(JForm $form, $data) | |||
} | |||
|
|||
$tosArticle = $this->params->get('register_tos_article'); | |||
$tosEnabled = $this->params->get('register-require_tos', 0); | |||
$tosEnabled = ($this->params->get('register-require_tos', 0) == 2); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove outside ()
which are not necessary.
installation/sql/mysql/joomla.sql
Outdated
(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 6, 0), | ||
(410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', '', 0, '0000-00-00 00:00:00', 1, 0), | ||
(410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":1,"lineWrapping":1,"matchTags":1,"matchBrackets":1,"markerGutter":1,"autoCloseTags":1,"autoCloseBrackets":1,"theme":"default"}', '', '', 0, '0000-00-00 00:00:00', 1, 0), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please confirm if "theme":"default"
should be empty. https://github.com/joomla/joomla-cms/pull/20544/files#diff-56697cf5f4f7b09581b782ea92afc869L226
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it should be empty.
I have tested this item ✅ successfully on db777e4 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/20893. |
1 similar comment
I have tested this item ✅ successfully on db777e4 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/20893. |
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/20893. |
@SharkyKZ It seems meanwhile this PR got conflicts because changes in staging meanwhile. Do you think you can continue this PR or make a new one? Or is this PR obsolete now because things are right meanwhile in staging? |
@SharkyKZ could you please resolve the conflicts? |
Conflicts solved. |
Do we have tests for all 3 database engines? |
I removed RTC. We need tests for mysql, pgsql and mssql please. Include the version in the testing comment. Thanks for your effort testing this. |
3rd database test pending.... |
Dear @SharkyKZ in preperation of the upcomming release of Joomla 3.10 we have used GitHubs rename feature to rename the staging branch into 3.10-dev. Usually GitHub moves all existing PRs towards the new branch just fine, but here it didnt work. The reason seems to be that the fork of the CMS that was used as base for this PR has been deleted so GitHub does no longer have a base to rebase the PR against the new branch and we are also not able to reopen the PR. For that reason GitHub closed this PR in my name, when this issue is still valid It would require a new PR against the new 3.10-dev or 4.0-dev branch. |
Pull Request for Issue # .
Summary of Changes
As per #20563, this syncs default plugin param values in installation SQL files with changes made in PRs #20544, #20456, #20422, #20412 and #20410. This mainly affects numeric values that were stored as strings.
Testing Instructions
Code review.
Documentation Changes Required
No.