From c3b8ee10ad26161f4f2d95532eb550ef9f31c970 Mon Sep 17 00:00:00 2001 From: Konstantin Kolos Date: Mon, 7 Jun 2021 13:14:42 +0300 Subject: [PATCH 01/10] [4.0] Fix radio buttons in batch processing (#33900) * Fix radio buttons in batch processing * Remove * Remove filedset & class="control-group radio" * Another attempt to fix PCP cs --- .../com_fields/tmpl/fields/default_batch_body.php | 6 +++--- .../components/com_menus/tmpl/items/default_batch_body.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php index 33d26bafb1c51..5c07fe160b884 100644 --- a/administrator/components/com_fields/tmpl/fields/default_batch_body.php +++ b/administrator/components/com_fields/tmpl/fields/default_batch_body.php @@ -17,7 +17,7 @@ $wa->useScript('com_fields.admin-fields-batch'); $wa->useScript('joomla.batch-copymove'); -$context = $this->escape($this->state->get('filter.context')); +$context = $this->escape($this->state->get('filter.context')); ?>
@@ -35,7 +35,7 @@
-
+
get('Groups'), 'value', 'text'); ?>
-
+
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php index aae69b60255e3..eb3ce1101ee0b 100644 --- a/administrator/components/com_menus/tmpl/items/default_batch_body.php +++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php @@ -48,14 +48,14 @@
= 0) : ?>
-
+
-
+
From d7f26ec0bb84d7b41185a580324caef3dc021ddd Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 7 Jun 2021 12:14:50 +0100 Subject: [PATCH 02/10] [4.0] admin module descriptions (#34441) As the private messages and post-install messages modules are not displayed (even if published) unless there are messages to read this could confuse some users so the description of the modules is updated for clarity --- administrator/language/en-GB/mod_messages.ini | 2 +- administrator/language/en-GB/mod_messages.sys.ini | 2 +- administrator/language/en-GB/mod_post_installation_messages.ini | 2 +- .../language/en-GB/mod_post_installation_messages.sys.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/administrator/language/en-GB/mod_messages.ini b/administrator/language/en-GB/mod_messages.ini index 0eb75a5245b2e..a02bfa1c0deec 100644 --- a/administrator/language/en-GB/mod_messages.ini +++ b/administrator/language/en-GB/mod_messages.ini @@ -5,4 +5,4 @@ MOD_MESSAGES="Messages" MOD_MESSAGES_PRIVATE_MESSAGES="Private Messages" -MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position." +MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read." diff --git a/administrator/language/en-GB/mod_messages.sys.ini b/administrator/language/en-GB/mod_messages.sys.ini index 27d095da00f86..22651d04e510f 100644 --- a/administrator/language/en-GB/mod_messages.sys.ini +++ b/administrator/language/en-GB/mod_messages.sys.ini @@ -5,4 +5,4 @@ MOD_MESSAGES="Messages" MOD_MESSAGES_LAYOUT_DEFAULT="Default" -MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position." +MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read." diff --git a/administrator/language/en-GB/mod_post_installation_messages.ini b/administrator/language/en-GB/mod_post_installation_messages.ini index bede88c55b58e..1800cf5669df5 100644 --- a/administrator/language/en-GB/mod_post_installation_messages.ini +++ b/administrator/language/en-GB/mod_post_installation_messages.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages" -MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages." +MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read." diff --git a/administrator/language/en-GB/mod_post_installation_messages.sys.ini b/administrator/language/en-GB/mod_post_installation_messages.sys.ini index bede88c55b58e..1800cf5669df5 100644 --- a/administrator/language/en-GB/mod_post_installation_messages.sys.ini +++ b/administrator/language/en-GB/mod_post_installation_messages.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages" -MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages." +MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read." From 085ad623545a62ef5861be9699996e13576bb337 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 7 Jun 2021 22:01:49 +0100 Subject: [PATCH 03/10] [4.0] com contact unused fields (#34418) --- .../components/com_contact/config.xml | 2 +- .../components/com_contact/forms/contact.xml | 54 ------------------- administrator/language/en-GB/com_contact.ini | 3 +- 3 files changed, 3 insertions(+), 56 deletions(-) diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml index 274167111beae..ea1170481a05a 100644 --- a/administrator/components/com_contact/config.xml +++ b/administrator/components/com_contact/config.xml @@ -396,7 +396,7 @@
- - - - - - - - - - - - - - - - - -
diff --git a/administrator/language/en-GB/com_contact.ini b/administrator/language/en-GB/com_contact.ini index ba97bb7e9ceac..1e5598c34bc5f 100644 --- a/administrator/language/en-GB/com_contact.ini +++ b/administrator/language/en-GB/com_contact.ini @@ -37,7 +37,7 @@ COM_CONTACT_FIELD_CONFIG_CONTACT_FORM="Form" COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country" COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply" COM_CONTACT_FIELD_CONFIG_FAX_LABEL="Fax" -COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for single Contact unless they are changed for a specific menu item or Contact." +COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for a single Contact unless they are changed for a specific menu item or Contact." COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY="Contact" COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL="Mobile" COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone" @@ -144,6 +144,7 @@ COM_CONTACT_FORM_TITLE_EDIT="Edit Contact" COM_CONTACT_FORM_TITLE_NEW="New Contact" COM_CONTACT_HEADING_ASSOCIATION="Association" COM_CONTACT_ICONS_SETTINGS="Icons" +COM_CONTACT_ICONS_SETTINGS_DESC="These settings apply to all single Contact views." COM_CONTACT_ID_LABEL="ID" COM_CONTACT_MAIL_FIELDSET_LABEL="Mail Options" COM_CONTACT_MAIL_MAIL_COPY_DESC="Sent to the submitter of a mail with the contact form if the optional "Send Copy to Submitter" is enabled and selected." From e62323fc97b5225650825efa5dbbbd39af1cb695 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Mon, 7 Jun 2021 23:04:22 +0200 Subject: [PATCH 04/10] [4.0] add rel attribute in joomla.ini (#34434) --- installation/language/en-GB/joomla.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini index c3c588ed358f9..d7e89a4fa3b5a 100644 --- a/installation/language/en-GB/joomla.ini +++ b/installation/language/en-GB/joomla.ini @@ -81,7 +81,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed." INSTL_DATABASE_HOST_DESC="Enter the host name, usually \"localhost\" or a name provided by your host." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named \"%1$s\" and upload it to the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="To confirm that you are the owner of this website please delete the file named \"%1$s\" that has been created in the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. Please read the documentation for more information." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. Please read the documentation for more information." INSTL_DATABASE_HOST_LABEL="Host Name" INSTL_DATABASE_NAME_DESC="Enter the database name." INSTL_DATABASE_NAME_LABEL="Database Name" @@ -94,7 +94,7 @@ INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally INSTL_DATABASE_RESPONSE_ERROR="The installation process failed." INSTL_DATABASE_TYPE_DESC="Select the database type." INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host." -INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this wiki for more information." +INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this wiki for more information." INSTL_CONNECT_DB="Setup Database Connection" INSTL_INSTALL_JOOMLA="Install Joomla" From 4dafe440b14f80d6f52686d1ffc88cd19abb43f1 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Mon, 7 Jun 2021 23:06:14 +0200 Subject: [PATCH 05/10] [4.0] Improving the display of an arrow in language string in "plg_system_updatenotification.*" (#34444) --- administrator/language/en-GB/com_associations.ini | 4 ++-- administrator/language/en-GB/com_cpanel.ini | 2 +- administrator/language/en-GB/com_modules.ini | 2 +- administrator/language/en-GB/plg_system_stats.ini | 2 +- .../language/en-GB/plg_system_updatenotification.ini | 2 +- .../language/en-GB/plg_system_updatenotification.sys.ini | 2 +- language/en-GB/mod_login.ini | 2 +- language/en-GB/mod_login.sys.ini | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/administrator/language/en-GB/com_associations.ini b/administrator/language/en-GB/com_associations.ini index a79de64ed930a..f86a9507a4946 100644 --- a/administrator/language/en-GB/com_associations.ini +++ b/administrator/language/en-GB/com_associations.ini @@ -46,8 +46,8 @@ COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -" COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE_LABEL="Select Target Language" COM_ASSOCIATIONS_TABLE_CAPTION="Table of Associations" COM_ASSOCIATIONS_TITLE="Associations" -COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s > %2$s)" -COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s > %2$s)" +COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s → %2$s)" +COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s → %2$s)" COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language" COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component" COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM="You can't check in this item" diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini index 358122047a642..9c4f8bfed75fb 100644 --- a/administrator/language/en-GB/com_cpanel.ini +++ b/administrator/language/en-GB/com_cpanel.ini @@ -26,7 +26,7 @@ COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update" COM_CPANEL_MSG_STATS_COLLECTION_BODY="

Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.

This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.

In the interest of full transparency and to help developers this data is publicly available. An API and graphs will show the Joomla version, PHP versions and database engines in use.

If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.

" COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla" -COM_CPANEL_MSG_TEXTFILTER3919_BODY="

As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System -> Global Configuration -> Text Filters

" +COM_CPANEL_MSG_TEXTFILTER3919_BODY="

As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System → Global Configuration → Text Filters

" COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations" COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel" COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module" diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini index 0958eb86ac8b8..cfb0cc3c87bf1 100644 --- a/administrator/language/en-GB/com_modules.ini +++ b/administrator/language/en-GB/com_modules.ini @@ -94,7 +94,7 @@ COM_MODULES_MODULE_TEMPLATE_POSITION="%1$s (%2$s)" COM_MODULES_MODULES="Modules" COM_MODULES_MODULES_FILTER_SEARCH_DESC="Search in module title and note. Prefix with ID: to search for a module ID." COM_MODULES_MODULES_FILTER_SEARCH_LABEL="Search Modules" -COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System > Manage > Extensions to enable it." +COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System → Manage → Extensions to enable it." COM_MODULES_MSG_MANAGE_NO_MODULES="There are no modules matching your query" COM_MODULES_N_ITEMS_ARCHIVED="%d modules archived." COM_MODULES_N_ITEMS_ARCHIVED_1="Module archived." diff --git a/administrator/language/en-GB/plg_system_stats.ini b/administrator/language/en-GB/plg_system_stats.ini index 68177d9995113..c322fd4d7e50b 100644 --- a/administrator/language/en-GB/plg_system_stats.ini +++ b/administrator/language/en-GB/plg_system_stats.ini @@ -20,7 +20,7 @@ PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send" PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send" PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand" PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?" -PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics." +PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins → System - Joomla! Statistics." PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Select here to see the information that will be sent." PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique ID" PLG_SYSTEM_STATS_SETTING="Setting" diff --git a/administrator/language/en-GB/plg_system_updatenotification.ini b/administrator/language/en-GB/plg_system_updatenotification.ini index 4e6259712c86a..73f8d098c0b56 100644 --- a/administrator/language/en-GB/plg_system_updatenotification.ini +++ b/administrator/language/en-GB/plg_system_updatenotification.ini @@ -16,4 +16,4 @@ PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)" PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="

In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails.

" -PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates." +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System → Mail Templates." diff --git a/administrator/language/en-GB/plg_system_updatenotification.sys.ini b/administrator/language/en-GB/plg_system_updatenotification.sys.ini index 700a0c1d4cfa9..705dcc576acc3 100644 --- a/administrator/language/en-GB/plg_system_updatenotification.sys.ini +++ b/administrator/language/en-GB/plg_system_updatenotification.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification" -PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates." +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System → Mail Templates." diff --git a/language/en-GB/mod_login.ini b/language/en-GB/mod_login.ini index f1d65959aea33..f63a865d26f21 100644 --- a/language/en-GB/mod_login.ini +++ b/language/en-GB/mod_login.ini @@ -25,4 +25,4 @@ MOD_LOGIN_VALUE_ICONS="Icons" MOD_LOGIN_VALUE_NAME="Name" MOD_LOGIN_VALUE_TEXT="Text" MOD_LOGIN_VALUE_USERNAME="Username" -MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users." +MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users → Manage → Options), another link will be shown to enable self-registration for users." diff --git a/language/en-GB/mod_login.sys.ini b/language/en-GB/mod_login.sys.ini index 116dd633beddb..8122d48642c9e 100644 --- a/language/en-GB/mod_login.sys.ini +++ b/language/en-GB/mod_login.sys.ini @@ -5,5 +5,5 @@ MOD_LOGIN="Login" MOD_LOGIN_LAYOUT_DEFAULT="Default" -MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users." +MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users → Manage → Options), another link will be shown to enable self-registration for users." From ae426305af074b7e841dbd384dff1fdb3290441f Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 8 Jun 2021 00:07:35 +0100 Subject: [PATCH 06/10] [4.0] s/encription/encryption (#34458) typo code review --- libraries/src/Console/SetConfigurationCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Console/SetConfigurationCommand.php b/libraries/src/Console/SetConfigurationCommand.php index 876c33ad53906..2adc3d5ab532c 100644 --- a/libraries/src/Console/SetConfigurationCommand.php +++ b/libraries/src/Console/SetConfigurationCommand.php @@ -341,7 +341,7 @@ public function checkDb($options): bool if (!$model->validateDbConnection($options)) { - $this->ioStyle->error(Text::_('Failed to validate the db connection encription properties')); + $this->ioStyle->error(Text::_('Failed to validate the db connection encryption properties')); return false; } From 90d49ae2378bf64746d1788da46bd92d805f264c Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 8 Jun 2021 00:08:10 +0100 Subject: [PATCH 07/10] [4.0] com_admin typos (#34454) * [4.0] com_admin typos code review * x * z --- administrator/components/com_admin/script.php | 2 +- .../com_admin/sql/others/mysql/utf8mb4-conversion.sql | 2 +- .../com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 2fd5ac07e8cf3..9a19f30f4f4bb 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -560,7 +560,7 @@ protected function updateManifestCaches() * Delete files that should not exist * * @param bool $dryRun If set to true, will not actually delete files, but just report their status for use in CLI - * @param bool $suppressOutput Set to true to supress echoing any errors, and just return the $status array + * @param bool $suppressOutput Set to true to suppress echoing any errors, and just return the $status array * * @return array */ diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql index b8e951bc1abd6..91b4b94b28973 100644 --- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql @@ -1,5 +1,5 @@ -- --- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation +-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation -- except of #__finder_xxx tables, those are handled with 4.0.0-2018-07-29.sql at update. -- diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql index 794d604bae152..a3b8fd0088186 100644 --- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql @@ -7,7 +7,7 @@ -- -- --- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation. +-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation. -- ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; From 8d3ae63c80e0c4d382b5b81080c0cfccf1e04427 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 8 Jun 2021 00:09:47 +0100 Subject: [PATCH 08/10] [4.0] s/proccess/process (#34457) typo code review --- libraries/src/Application/DaemonApplication.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/src/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php index 43e1ed1b52a5f..273fb503da0a9 100644 --- a/libraries/src/Application/DaemonApplication.php +++ b/libraries/src/Application/DaemonApplication.php @@ -466,7 +466,7 @@ protected function changeIdentity() // Change the user id for the process necessary. if ($uid && (posix_getuid($file) != $uid) && (!@ posix_setuid($uid))) { - Log::add('Unable to change user ownership of the proccess.', Log::ERROR); + Log::add('Unable to change user ownership of the process.', Log::ERROR); return false; } @@ -474,7 +474,7 @@ protected function changeIdentity() // Change the group id for the process necessary. if ($gid && (posix_getgid($file) != $gid) && (!@ posix_setgid($gid))) { - Log::add('Unable to change group ownership of the proccess.', Log::ERROR); + Log::add('Unable to change group ownership of the process.', Log::ERROR); return false; } @@ -806,15 +806,15 @@ protected function writeProcessIdFile() // Write the process id file out to disk. if (!file_put_contents($file, $this->processId)) { - Log::add('Unable to write proccess id file: ' . $file, Log::ERROR); + Log::add('Unable to write process id file: ' . $file, Log::ERROR); return false; } - // Make sure the permissions for the proccess id file are accurate. + // Make sure the permissions for the process id file are accurate. if (!chmod($file, 0644)) { - Log::add('Unable to adjust permissions for the proccess id file: ' . $file, Log::ERROR); + Log::add('Unable to adjust permissions for the process id file: ' . $file, Log::ERROR); return false; } From 5fdba4e5ee022517a05ae893d8f7077eaf864bf7 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 8 Jun 2021 00:12:23 +0100 Subject: [PATCH 09/10] [4.0] s/minumum/minimum (#34459) typo code review --- libraries/src/Updater/Adapter/ExtensionAdapter.php | 6 +++--- libraries/src/Updater/Update.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php index ae2ce36537ded..df35e30f13add 100644 --- a/libraries/src/Updater/Adapter/ExtensionAdapter.php +++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php @@ -158,8 +158,8 @@ protected function _endElement($parser, $name) // Do we have an entry for the database? if (\array_key_exists($dbType, $supportedDbs)) { - $minumumVersion = $supportedDbs[$dbType]; - $dbMatch = version_compare($dbVersion, $minumumVersion, '>='); + $minimumVersion = $supportedDbs[$dbType]; + $dbMatch = version_compare($dbVersion, $minimumVersion, '>='); if (!$dbMatch) { @@ -170,7 +170,7 @@ protected function _endElement($parser, $name) $this->currentUpdate->version, Text::_($db->name), $dbVersion, - $minumumVersion + $minimumVersion ); Factory::getApplication()->enqueueMessage($dbMsg, 'warning'); diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php index 7553e7b4ca478..4f6887ad9d824 100644 --- a/libraries/src/Updater/Update.php +++ b/libraries/src/Updater/Update.php @@ -369,8 +369,8 @@ public function _endElement($parser, $name) // Do we have an entry for the database? if (isset($supportedDbs->$dbType)) { - $minumumVersion = $supportedDbs->$dbType; - $dbMatch = version_compare($dbVersion, $minumumVersion, '>='); + $minimumVersion = $supportedDbs->$dbType; + $dbMatch = version_compare($dbVersion, $minimumVersion, '>='); } } else From a8da66982a39030c0867253fa4116fee1d91f2ad Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 8 Jun 2021 00:14:00 +0100 Subject: [PATCH 10/10] [4.0] quickiocn helper (#34455) typo in group name - code review --- .../modules/mod_quickicon/src/Helper/QuickIconHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php index 1e2500c759323..56c3a86329eba 100644 --- a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php @@ -234,7 +234,7 @@ public function getButtons(Registry $params, CMSApplication $application = null) 'link' => Route::_('index.php?option=com_cache'), 'name' => 'MOD_QUICKICON_CACHE', 'access' => array('core.admin', 'com_cache'), - 'group' => 'MOD_QUICKICON_SYTEM' + 'group' => 'MOD_QUICKICON_SYSTEM' ]; if ($params->get('show_cache') == 2)