Merge branch '4.0-dev' into switcher-label

.drone.yml

@@ -197,7 +197,6 @@ steps:
   - name: system-tests-mysql8
     depends_on: [ system-tests-mysql ]
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
 
@@ -298,6 +297,6 @@ services:
 
 ---
 kind: signature
-hmac: 1f8eaa619ff21c79d04d71f2323bb2600024fb54ae56e57a9238d8da0e63255c
+hmac: 9269cc571ec30d3d18ba3bb5f7dc132c36608b54ec777ae6d9c6dde224255fc8
 
 ...

administrator/components/com_joomlaupdate/Model/UpdateModel.php

@@ -1227,7 +1227,7 @@ public function getPhpSettings()
 		// Check for output buffering.
 		$setting = new \stdClass;
 		$setting->label = Text::_('INSTL_OUTPUT_BUFFERING');
-		$setting->state = (bool) ini_get('output_buffering');
+		$setting->state = (int) ini_get('output_buffering') !== 0;
 		$setting->recommended = false;
 		$settings[] = $setting;
 

administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php

@@ -15,7 +15,7 @@
 ?>
 
 <h2 class="mt-3 mb-3">
-	<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK', '&#x200E;' . $this->updateInfo['latest']); ?>
+	<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK', '&#x200E;' . $this->updateInfo['latest']); ?>
 </h2>
 
 <div class="row">
@@ -103,6 +103,7 @@
 	</div>
 </div>
 <div class="row">
+	<?php if (!empty($this->nonCoreExtensions)) : ?>
 	<div class="col-md-6">
 		<fieldset class="options-grid-form options-grid-form-full">
 			<legend>
@@ -145,6 +146,7 @@
 			</table>
 		</fieldset>
 	</div>
+	<?php endif; ?>
 	<div class="col-md-6">
 		<fieldset class="options-grid-form options-grid-form-full">
 			<legend>

administrator/components/com_languages/Controller/InstalledController.php

@@ -84,9 +84,15 @@ public function switchAdminLanguage()
 		$cid   = $this->input->get('cid', '');
 		$model = $this->getModel('installed');
 
-		// Fetching the language name from the xx-XX.xml
+		// Fetching the language name from the xx-XX.xml or langmetadata.xml respectively.
 		$file = JPATH_ADMINISTRATOR . '/language/' . $cid . '/' . $cid . '.xml';
-		$info = Installer::parseXMLInstallFile($file);
+
+		if (!is_file($file))
+		{
+			$file = JPATH_ADMINISTRATOR . '/language/' . $cid . '/langmetadata.xml';
+		}
+
+		$info         = Installer::parseXMLInstallFile($file);
 		$languageName = $info['name'];
 
 		if ($model->switchAdminLanguage($cid))

administrator/components/com_media/tmpl/file/default.php

@@ -22,8 +22,8 @@
 HTMLHelper::_('behavior.formvalidator');
 
 // Add stylesheets
-HTMLHelper::_('stylesheet', 'media/com_media/css/mediamanager.css');
-HTMLHelper::_('script', 'com_media/edit-images.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('stylesheet', 'com_media/mediamanager.css', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('script', 'com_media/edit-images.js', ['version' => 'auto', 'relative' => true]);
 
 $params = ComponentHelper::getParams('com_media');
 

administrator/components/com_media/tmpl/media/default.php

@@ -22,10 +22,10 @@
 HTMLHelper::_('behavior.keepalive');
 
 // Add javascripts
-HTMLHelper::_('script', 'media/com_media/js/mediamanager.js');
+HTMLHelper::_('script', 'com_media/mediamanager.js', ['version' => 'auto', 'relative' => true]);
 
 // Add stylesheets
-HTMLHelper::_('stylesheet', 'media/com_media/css/mediamanager.css');
+HTMLHelper::_('stylesheet', 'com_media/mediamanager.css', ['version' => 'auto', 'relative' => true]);
 
 // Populate the language
 $this->loadTemplate('texts');

administrator/language/en-GB/en-GB.com_banners.ini

@@ -187,4 +187,6 @@ COM_BANNERS_TYPE1="Impressions"
 COM_BANNERS_TYPE2="Clicks"
 COM_BANNERS_UNLIMITED="Unlimited"
 COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_BANNERS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_cache.ini

@@ -34,4 +34,6 @@ COM_CACHE_SIZE="Size"
 COM_CACHE_SELECT_CLIENT="- Select Location -"
 COM_CACHE_TABLE_CAPTION="Table of Cached Files"
 COM_CACHE_XML_DESCRIPTION="Component for cache management."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_CACHE="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_checkin.ini

@@ -23,4 +23,6 @@ COM_CHECKIN_N_QUICKICON_SRONLY_1="Global Checkin: One table has locked items."
 COM_CHECKIN_TABLE="<em>%s</em> table"
 COM_CHECKIN_TABLE_CAPTION="Table of Checked Out Items"
 COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_CHECKIN="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_config.ini

@@ -199,4 +199,6 @@ COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all
 COM_CONFIG_TEXT_FILTERS_NOTE="WARNING: You have configured a parent group with the setting 'No Filtering' - this setting can't be overridden in child groups and any other configured filter will not be applied."
 COM_CONFIG_TEXT_FILTERS_SUMMARY="Expand for notes about the text filters"
 COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
-JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_CONFIG="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items."

administrator/language/en-GB/en-GB.com_contact.ini

@@ -182,4 +182,6 @@ JGLOBAL_FIELDSET_DISPLAY_LINK_OPTIONS="Link options"
 JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
 JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
 JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_CONTACT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_content.ini

@@ -186,5 +186,12 @@ JGLOBAL_NO_ITEM_SELECTED="No articles selected"
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new articles in this category."
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EXECUTE_TRANSITION="You are not allowed to execute a transition for one or more of these articles."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
-JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this article only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+JLIB_RULES_SETTING_NOTES_COM_CONTENT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_ITEM_COM_CONTENT_ARTICLE="Changes apply to this article only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Fields overrides
+COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups"
+COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group"
+COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group"

administrator/language/en-GB/en-GB.com_installer.ini

@@ -286,6 +286,8 @@ COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..."
 COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later."
 COM_INSTALLER_WEBINSTALLER_LOAD_APPS="Select to load extensions browser"
 COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions"
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
 COM_INSTALLER_UPDATE_MISSING_DOWNLOADKEY_LABEL_N="%d extension updates cannot be installed until you <a href=\"%s\">enter their corresponding Download Keys</a>."
 COM_INSTALLER_UPDATE_MISSING_DOWNLOADKEY_LABEL_N_1="One extension update cannot be installed until you <a href=\"%2$s\">enter its Download Key</a>."
+
+; Alternate language strings for the rules form field
+JLIB_RULES_SETTING_NOTES_COM_INSTALLER="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_languages.ini

@@ -140,4 +140,6 @@ COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON="Search"
 COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND="Search text you want to change."
 COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP="A language string is composed of two parts: a specific language constant and its value.<br>For example, in the string: COM_CONTENT_READ_MORE=&quot;Read more: &quot;<br>'<u>COM_CONTENT_READ_MORE</u>' is the constant and '<u>Read more: </u>' is the value.<br>You have to use the specific language constant to create an override of the value.<br>Therefore, you can search for the constant or the value you want to change with the search field below.<br>By selecting the desired result the correct constant will automatically be inserted into the form."
 COM_LANGUAGES_XML_DESCRIPTION="Component for language management"
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+JLIB_RULES_SETTING_NOTES_COM_LANGUAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_menus.ini

@@ -203,4 +203,6 @@ COM_MENUS_VIEW_MENUS_TITLE="Menus"
 COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Item"
 COM_MENUS_VIEW_NEW_MENU_TITLE="Menus: Add"
 COM_MENUS_XML_DESCRIPTION="Component for creating menus."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+JLIB_RULES_SETTING_NOTES_COM_MENUS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_messages.ini

@@ -68,4 +68,6 @@ COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages: View"
 COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Private Messages: Write"
 COM_MESSAGES_XML_DESCRIPTION="Component for private messaging support in Backend."
 JLIB_APPLICATION_SAVE_SUCCESS="Message sent."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_MESSAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

administrator/language/en-GB/en-GB.com_modules.ini

@@ -180,4 +180,6 @@ COM_MODULES_DESELECT="Deselect"
 COM_MODULES_EXPAND="Expand"
 COM_MODULES_COLLAPSE="Collapse"
 COM_MODULES_SUBITEMS="Sub-items"
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+
+; Alternate language strings for the rules form field
+ JLIB_RULES_SETTING_NOTES_COM_MODULES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."