Merge branch '4.0-dev' into amenu

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+### Steps to reproduce the issue
+
+
+
+### Expected result
+
+
+
+### Actual result
+
+
+
+### System information (as much as possible)
+
+
+
+### Additional comments

.github/ISSUE_TEMPLATE/Custom.md

@@ -0,0 +1,16 @@
+---
+name: Fix this template
+about: Suggest a fix it
+
+---
+
+### What needs to be fixed
+
+
+### Why this should be fixed
+
+
+### How would you fix it
+
+
+### Side Effects expected

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+### Is your feature request related to a problem? Please describe.
+
+
+
+### Describe the solution you'd like
+
+
+
+### Additional context

administrator/components/com_admin/postinstall/updatedefaultsettings.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in various default settings.
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Notifies users of a change in various default settings
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   3.8.8
+ */
+function admin_postinstall_updatedefaultsettings_condition()
+{
+	return true;
+}

administrator/components/com_admin/sql/updates/mysql/3.8.8-2018-05-18.sql

@@ -0,0 +1,3 @@
+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`)
+VALUES
+(700, 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE', 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/updatedefaultsettings.php', 'admin_postinstall_updatedefaultsettings_condition', '3.8.8', 1);

administrator/components/com_admin/sql/updates/postgresql/3.8.8-2018-05-18.sql

@@ -0,0 +1,3 @@
+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")
+VALUES
+(700, 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE', 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/updatedefaultsettings.php', 'admin_postinstall_updatedefaultsettings_condition', '3.8.8', 1);

administrator/components/com_categories/Helper/CategoryAssociationHelper.php

@@ -25,12 +25,13 @@ abstract class CategoryAssociationHelper
 	 *
 	 * @param   integer  $id         Id of the item
 	 * @param   string   $extension  Name of the component
+	 * @param   string   $layout     Category layout
 	 *
 	 * @return  array    Array of associations for the component categories
 	 *
 	 * @since  3.0
 	 */
-	public static function getCategoryAssociations($id = 0, $extension = 'com_content')
+	public static function getCategoryAssociations($id = 0, $extension = 'com_content', $layout = null)
 	{
 		$return = array();
 
@@ -44,11 +45,13 @@ public static function getCategoryAssociations($id = 0, $extension = 'com_conten
 			{
 				if (class_exists($helperClassname) && is_callable(array($helperClassname, 'getCategoryRoute')))
 				{
-					$return[$tag] = $helperClassname::getCategoryRoute($item, $tag);
+					$return[$tag] = $helperClassname::getCategoryRoute($item, $tag, $layout);
 				}
 				else
 				{
-					$return[$tag] = 'index.php?option=' . $extension . '&view=category&id=' . $item;
+					$viewLayout = $layout ? '&layout=' . $layout : '';
+
+					$return[$tag] = 'index.php?option=' . $extension . '&view=category&id=' . $item . $viewLayout;
 				}
 			}
 		}

administrator/components/com_finder/Service/HTML/Filter.php

@@ -192,9 +192,9 @@ public function slider($options = array())
 
 				// Build a node.
 				$html .= '<div class="form-check">';
-				$html .= '<label class="form-check-label" for="tax-' . $nk . '">';
+				$html .= '<label class="form-check-label">';
 				$html .= '<input type="checkbox" class="form-check-input selector filter-node' . $classSuffix . '" value="' . $nk . '" name="t[]" id="tax-'
-					. $nk . '"' . $checked . '> ' . $nv->title;
+					. $bk . '"' . $checked . '> ' . $nv->title;
 				$html .= '</label>';
 				$html .= '</div>';
 			}

administrator/components/com_finder/helpers/indexer/indexer.php

@@ -91,7 +91,7 @@ abstract class FinderIndexer
 	/**
 	 * Database driver cache.
 	 *
-	 * @var    JDatabaseDriver
+	 * @var    \Joomla\Database\DatabaseDriver
 	 * @since  3.8.0
 	 */
 	protected $db;
@@ -290,8 +290,8 @@ public function remove($linkId)
 		// Update the link counts for the terms.
 		$query->clear()
 			->update($db->quoteName('#__finder_terms', 't'))
-			->join('INNER', $db->quoteName('#__finder_links_terms', 'm') . ' ON m.term_id = t.term_id')
-			->set('t.links = t.links - 1')
+			->join('INNER', $db->quoteName('#__finder_links_terms', 'm') . ' ON ' . $db->quoteName('m.term_id') . ' = ' . $db->quoteName('t.term_id'))
+			->set($db->quoteName('links') . ' = ' . $db->quoteName('links') . ' - 1')
 			->where($db->quoteName('m.link_id') . ' = ' . (int) $linkId);
 		$db->setQuery($query)->execute();
 

administrator/components/com_media/config.xml

@@ -66,6 +66,7 @@
 			description="COM_MEDIA_FIELD_CHECK_MIME_DESC"
 			class="switcher"
 			default="1"
+			showon="restrict_uploads:1"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -78,6 +79,7 @@
 			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
 			size="50"
 			default="bmp,gif,jpg,png"
+			showon="restrict_uploads:1"
 		/>
 
 		<field
@@ -95,6 +97,7 @@
 			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
+			showon="restrict_uploads:1"
 		/>
 
 		<field
@@ -104,7 +107,8 @@
 			description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="text/html"
-		 />
+			showon="restrict_uploads:1"
+		/>
 	</fieldset>
 
 	<fieldset

administrator/components/com_menus/tmpl/item/edit.php

@@ -115,6 +115,7 @@
 				if ($this->item->type == 'url')
 				{
 					$this->form->setFieldAttribute('link', 'readonly', 'false');
+					$this->form->setFieldAttribute('link', 'required', 'true');
 				}
 
 				echo $this->form->renderField('link');

administrator/components/com_users/Model/UserModel.php

@@ -146,9 +146,9 @@ public function getForm($data = array(), $loadData = true)
 			return false;
 		}
 
-		// Passwords fields are required when mail to user is set to No in joomla user plugin
 		$userId = $form->getValue('id');
 
+		// Passwords fields are required when mail to user is set to No in the joomla user plugin
 		if ($userId === 0 && $pluginParams->get('mail_to_user', '1') === '0')
 		{
 			$form->setFieldAttribute('password', 'required', 'true');

administrator/components/com_users/tmpl/groups/default.php

@@ -58,11 +58,11 @@
 								</th>
 								<th scope="col" style="width:10%" class="text-center">
 									<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_USERS_COUNT_ENABLED_USERS'); ?>"></span>
-									<span class="d-none d-md-inline"><?php echo Text::_('COM_USERS_COUNT_ENABLED_USERS'); ?></span>
+									<span class="sr-only"><?php echo Text::_('COM_USERS_COUNT_ENABLED_USERS'); ?></span>
 								</th>
 								<th scope="col" style="width:10%" class="text-center">
 									<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_USERS_COUNT_DISABLED_USERS'); ?>"></span>
-									<span class="d-none d-md-inline"><?php echo Text::_('COM_USERS_COUNT_DISABLED_USERS'); ?></span>
+									<span class="sr-only"><?php echo Text::_('COM_USERS_COUNT_DISABLED_USERS'); ?></span>
 								</th>
 								<th scope="col" style="width:10%" class="d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>

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

@@ -69,7 +69,7 @@ COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server"
 COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
 COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From Email"
 COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
-COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To email"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To Email"
 COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL="Reply To Name"
 COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send Mail"
 COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL="Disable Mass Mail"

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

@@ -21,6 +21,8 @@ COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin w
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
 COM_CPANEL_SYSTEM_SETUP="Setup"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
 COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=706\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Control Panel component"

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

@@ -7,7 +7,6 @@ PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL="Active Line Colour"
 PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
 PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL="Bracket Completion"
 PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
-PLG_CODEMIRROR_FIELD_AUTOFOCUS_LABEL="Auto Focus"
 PLG_CODEMIRROR_FIELD_CODEFOLDING_LABEL="Code Folding"
 PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL="Font"
 PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)"
@@ -25,6 +24,7 @@ PLG_CODEMIRROR_FIELD_LINEWRAPPING_LABEL="Line Wrapping"
 PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL="Gutters"
 PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL="Match Brackets"
 PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL="Match Tags"
+PLG_CODEMIRROR_FIELD_PREVIEW_LABEL="Preview"
 PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_LABEL="Highlight Selection Matches"
 PLG_CODEMIRROR_FIELD_THEME_LABEL="Theme"
 PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT="Browser Default"

build/media/webcomponents/js/field-subform/field-subform.js

@@ -245,10 +245,10 @@
 
             let group    = row.getAttribute('data-group'), // current group name
                 basename = row.getAttribute('data-base-name'), // group base name, without count
-                countnew = Math.max(this.lastRowNum, count + 1),
+                countnew = Math.max(this.lastRowNum, count),
                 groupnew = basename + countnew; // new group name
 
-            this.lastRowNum = countnew;
+            this.lastRowNum = countnew + 1;
             row.setAttribute('data-group', groupnew);
 
             // Fix inputs that have a "name" attribute

components/com_contact/layouts/field/render.php

@@ -30,7 +30,7 @@
 	return;
 }
 
-if (!$value)
+if (!strlen($value))
 {
 	return;
 }

components/com_contact/layouts/fields/render.php

@@ -62,7 +62,7 @@
 foreach ($fields as $field)
 {
 	// If the value is empty do nothing
-	if (empty($field->value) && !$isMail)
+	if (!strlen($field->value) && !$isMail)
 	{
 		continue;
 	}

components/com_contact/tmpl/contact/default_user_custom_fields.php

@@ -39,7 +39,7 @@
 	<?php if ($presentation_style == 'sliders') : ?>
 		<?php echo HTMLHelper::_('bootstrap.addSlide', 'slide-contact', $groupTitle ?: Text::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php elseif ($presentation_style == 'tabs') : ?>
-		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'display-profile', $groupTitle ?: Text::_('COM_CONTACT_USER_FIELDS')); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'display-' . $id, $groupTitle ?: Text::_('COM_CONTACT_USER_FIELDS')); ?>
 	<?php elseif ($presentation_style == 'plain') : ?>
 		<?php echo '<h3>' . ($groupTitle ?: Text::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
 	<?php endif; ?>