Merge remote-tracking branch 'upstream/staging' into staging-com_redi…

…rects_improvements

administrator/components/com_admin/postinstall/joomla40checks.php

@@ -19,6 +19,7 @@
  * @since   3.7
  *
  * @link    https://developer.joomla.org/news/658-joomla4-manifesto.html
+ * @link    https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html
  */
 function admin_postinstall_joomla40checks_condition()
 {
@@ -50,6 +51,6 @@ function admin_postinstall_joomla40checks_condition()
 		return true;
 	}
 
-	// PHP minimum version is 5.5
-	return version_compare(PHP_VERSION, '5.5.9', 'lt');
+	// PHP minimum version is 7.0
+	return version_compare(PHP_VERSION, '7.0', 'lt');
 }

administrator/components/com_admin/script.php

@@ -1566,6 +1566,7 @@ public function deleteUnexistingFiles()
 			'/components/com_wrapper/metadata.xml',
 			'/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php',
 			'/administrator/components/com_cache/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_content/models/fields/votelist.php',
 			'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
 			'/administrator/components/com_languages/layouts/joomla/searchtools/default.php',
 			'/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php',
@@ -1596,29 +1597,30 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_admin/postinstall/phpversion.php',
 			'/components/com_content/layouts/field/prepare/modal_article.php',
 			// Joomla 3.8.0
+			'/administrator/components/com_content/models/fields/votelist.php',
+			'/administrator/modules/mod_menu/preset/disabled.php',
+			'/administrator/modules/mod_menu/preset/enabled.php',
 			'/libraries/cms/application/administrator.php',
 			'/libraries/cms/application/cms.php',
 			'/libraries/cms/application/helper.php',
 			'/libraries/cms/application/site.php',
 			'/libraries/cms/authentication/helper.php',
 			'/libraries/cms/captcha/captcha.php',
+			'/libraries/cms/component/exception/missing.php',
 			'/libraries/cms/component/helper.php',
 			'/libraries/cms/component/record.php',
-			'/libraries/cms/component/exception/missing.php',
+			'/libraries/cms/component/router/base.php',
+			'/libraries/cms/component/router/interface.php',
+			'/libraries/cms/component/router/legacy.php',
 			'/libraries/cms/component/router/rules/interface.php',
 			'/libraries/cms/component/router/rules/menu.php',
 			'/libraries/cms/component/router/rules/nomenu.php',
 			'/libraries/cms/component/router/rules/standard.php',
-			'/libraries/cms/component/router/base.php',
-			'/libraries/cms/component/router/interface.php',
-			'/libraries/cms/component/router/legacy.php',
 			'/libraries/cms/component/router/view.php',
 			'/libraries/cms/component/router/viewconfiguration.php',
 			'/libraries/cms/editor/editor.php',
 			'/libraries/cms/error/page.php',
-			'/libraries/cms/filter/input.php',
-			'/libraries/cms/filter/output.php',
-			'/libraries/cms/filter/wrapper/output.php',
+			'/libraries/cms/extension/helper.php',
 			'/libraries/cms/form/field/author.php',
 			'/libraries/cms/form/field/captcha.php',
 			'/libraries/cms/form/field/chromestyle.php',
@@ -1627,7 +1629,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/form/field/contenttype.php',
 			'/libraries/cms/form/field/editor.php',
 			'/libraries/cms/form/field/frontend_language.php',
-			'/libraries/cms/form/field/headertab.php',
+			'/libraries/cms/form/field/headertag.php',
 			'/libraries/cms/form/field/helpsite.php',
 			'/libraries/cms/form/field/lastvisitdaterange.php',
 			'/libraries/cms/form/field/limitbox.php',
@@ -1643,8 +1645,8 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/form/field/status.php',
 			'/libraries/cms/form/field/tag.php',
 			'/libraries/cms/form/field/templatestyle.php',
-			'/libraries/cms/form/field/useractive.php',
 			'/libraries/cms/form/field/user.php',
+			'/libraries/cms/form/field/useractive.php',
 			'/libraries/cms/form/field/usergrouplist.php',
 			'/libraries/cms/form/field/userstate.php',
 			'/libraries/cms/form/rule/captcha.php',
@@ -1658,12 +1660,8 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/helper/route.php',
 			'/libraries/cms/helper/tags.php',
 			'/libraries/cms/helper/usergroups.php',
+			'/libraries/cms/html/html.php',
 			'/libraries/cms/installer/adapter.php',
-			'/libraries/cms/installer/extension.php',
-			'/libraries/cms/installer/helper.php',
-			'/libraries/cms/installer/installer.php',
-			'/libraries/cms/installer/manifest.php',
-			'/libraries/cms/installer/script.php',
 			'/libraries/cms/installer/adapter/component.php',
 			'/libraries/cms/installer/adapter/file.php',
 			'/libraries/cms/installer/adapter/language.php',
@@ -1672,8 +1670,14 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/installer/adapter/package.php',
 			'/libraries/cms/installer/adapter/plugin.php',
 			'/libraries/cms/installer/adapter/template.php',
+			'/libraries/cms/installer/extension.php',
+			'/libraries/cms/installer/helper.php',
+			'/libraries/cms/installer/installer.php',
+			'/libraries/cms/installer/manifest.php',
 			'/libraries/cms/installer/manifest/library.php',
 			'/libraries/cms/installer/manifest/package.php',
+			'/libraries/cms/installer/script.php',
+			'/libraries/cms/language/associations.php',
 			'/libraries/cms/language/multilang.php',
 			'/libraries/cms/layout/base.php',
 			'/libraries/cms/layout/file.php',
@@ -1718,6 +1722,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/ucm/base.php',
 			'/libraries/cms/ucm/content.php',
 			'/libraries/cms/ucm/type.php',
+			'/libraries/cms/ucm/ucm.php',
 			'/libraries/cms/version/version.php',
 			'/libraries/joomla/access/access.php',
 			'/libraries/joomla/access/exception/notallowed.php',
@@ -1727,6 +1732,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/application/base.php',
 			'/libraries/joomla/application/cli.php',
 			'/libraries/joomla/application/daemon.php',
+			'/libraries/joomla/application/route.php',
 			'/libraries/joomla/application/web.php',
 			'/libraries/joomla/association/extension/helper.php',
 			'/libraries/joomla/association/extension/interface.php',
@@ -1825,6 +1831,16 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/form/rule/url.php',
 			'/libraries/joomla/form/rule/username.php',
 			'/libraries/joomla/form/wrapper/helper.php',
+			'/libraries/joomla/http/factory.php',
+			'/libraries/joomla/http/http.php',
+			'/libraries/joomla/http/response.php',
+			'/libraries/joomla/http/transport.php',
+			'/libraries/joomla/http/transport/cacert.pem',
+			'/libraries/joomla/http/transport/curl.php',
+			'/libraries/joomla/http/transport/socket.php',
+			'/libraries/joomla/http/transport/stream.php',
+			'/libraries/joomla/http/wrapper/factory.php',
+			'/libraries/joomla/image/filter.php',
 			'/libraries/joomla/image/filter/backgroundfill.php',
 			'/libraries/joomla/image/filter/brightness.php',
 			'/libraries/joomla/image/filter/contrast.php',
@@ -1834,7 +1850,6 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/image/filter/negate.php',
 			'/libraries/joomla/image/filter/sketchy.php',
 			'/libraries/joomla/image/filter/smooth.php',
-			'/libraries/joomla/image/filter.php',
 			'/libraries/joomla/image/image.php',
 			'/libraries/joomla/input/cli.php',
 			'/libraries/joomla/input/cookie.php',
@@ -1845,6 +1860,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/language/language.php',
 			'/libraries/joomla/language/stemmer.php',
 			'/libraries/joomla/language/stemmer/porteren.php',
+			'/libraries/joomla/language/text.php',
 			'/libraries/joomla/language/transliterate.php',
 			'/libraries/joomla/language/wrapper/helper.php',
 			'/libraries/joomla/language/wrapper/text.php',
@@ -1865,6 +1881,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/mail/wrapper/helper.php',
 			'/libraries/joomla/microdata/microdata.php',
 			'/libraries/joomla/microdata/types.json',
+			'/libraries/joomla/object/object.php',
 			'/libraries/joomla/profiler/profiler.php',
 			'/libraries/joomla/session/exception/unsupported.php',
 			'/libraries/joomla/session/session.php',
@@ -1918,8 +1935,6 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/view/legacy.php',
 			'/libraries/legacy/web/client.php',
 			'/libraries/legacy/web/web.php',
-			'/administrator/modules/mod_menu/preset/enabled.php',
-			'/administrator/modules/mod_menu/preset/disabled.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -2052,6 +2067,7 @@ public function deleteUnexistingFiles()
 			// Joomla! 3.7.4
 			'/components/com_fields/controllers',
 			// Joomla! 3.8.0
+			'/administrator/modules/mod_menu/preset',
 			'/libraries/cms/application',
 			'/libraries/cms/authentication',
 			'/libraries/cms/captcha',
@@ -2061,6 +2077,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/component',
 			'/libraries/cms/editor',
 			'/libraries/cms/error',
+			'/libraries/cms/extension',
 			'/libraries/cms/form/field',
 			'/libraries/cms/form/rule',
 			'/libraries/cms/form',
@@ -2119,17 +2136,22 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/filter',
 			'/libraries/joomla/form/rule',
 			'/libraries/joomla/form/wrapper',
+			'/libraries/joomla/http/transport',
+			'/libraries/joomla/http/wrapper',
+			'/libraries/joomla/http',
 			'/libraries/joomla/image/filter',
 			'/libraries/joomla/image',
 			'/libraries/joomla/input',
 			'/libraries/joomla/language/stemmer',
 			'/libraries/joomla/language/wrapper',
+			'/libraries/joomla/language',
 			'/libraries/joomla/log/logger',
 			'/libraries/joomla/log',
 			'/libraries/joomla/mail/language',
 			'/libraries/joomla/mail/wrapper',
 			'/libraries/joomla/mail',
 			'/libraries/joomla/microdata',
+			'/libraries/joomla/object',
 			'/libraries/joomla/profiler',
 			'/libraries/joomla/session/exception',
 			'/libraries/joomla/table',
@@ -2142,10 +2164,10 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/categories',
 			'/libraries/legacy/controller',
 			'/libraries/legacy/model',
+			'/libraries/legacy/table/menu',
 			'/libraries/legacy/view',
 			'/libraries/legacy/web',
-			'/administrator/modules/mod_menu/preset',
-			'/administrator/components/com_content/models/fields/votelist.php',
+			'/media/editors/tinymce/plugins/jdragdrop',
 		);
 
 		jimport('joomla.filesystem.file');

administrator/components/com_admin/views/help/tmpl/langforum.php

@@ -9,7 +9,15 @@
 
 defined('_JEXEC') or die;
 
-$forumId   = (int) JText::_('COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+JFactory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
+
+$forumId   = (int) JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+
+if (empty($forumId))
+{
+	$forumId = 511;
+}
+
 $forum_url = 'https://forum.joomla.org/viewforum.php?f=' . $forumId;
 
 JFactory::getApplication()->redirect($forum_url);

administrator/components/com_categories/models/fields/categoryedit.php

@@ -145,7 +145,7 @@ protected function getOptions()
 		$user = JFactory::getUser();
 
 		$query = $db->getQuery(true)
-			->select('a.id AS value, a.title AS text, a.level, a.published, a.lft')
+			->select('a.id AS value, a.title AS text, a.level, a.published, a.lft, a.language')
 			->from('#__categories AS a');
 
 		// Filter by the extension type
@@ -232,16 +232,6 @@ protected function getOptions()
 				}
 			}
 
-			// Displays language code if not set to All
-			$db = JFactory::getDbo();
-			$query = $db->getQuery(true)
-				->select($db->quoteName('language'))
-				->where($db->quoteName('id') . '=' . (int) $options[$i]->value)
-				->from($db->quoteName('#__categories'));
-
-			$db->setQuery($query);
-			$language = $db->loadResult();
-
 			if ($options[$i]->level != 0)
 			{
 				$options[$i]->level = $options[$i]->level -1;
@@ -256,9 +246,10 @@ protected function getOptions()
 				$options[$i]->text = str_repeat('- ', $options[$i]->level) . '[' . $options[$i]->text . ']';
 			}
 
-			if ($language !== '*')
+			// Displays language code if not set to All
+			if ($options[$i]->language !== '*')
 			{
-				$options[$i]->text = $options[$i]->text . ' (' . $language . ')';
+				$options[$i]->text = $options[$i]->text . ' (' . $options[$i]->language . ')';
 			}
 		}
 

administrator/components/com_contact/config.xml

@@ -946,7 +946,7 @@
 			type="radio"
 			label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 			description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
-			default="1"
+			default="0"
 			class="btn-group btn-group-yesno"
 			showon="show_email_form:1"
 			>

administrator/components/com_contact/helpers/contact.php

@@ -195,6 +195,12 @@ public static function validateSection($section, $item)
 			$section = 'mail';
 		}
 
+		if (JFactory::getApplication()->isClient('site') && $section == 'category')
+		{
+			// The contact form needs to be the mail section
+			$section = 'contact';
+		}
+
 		if ($section != 'mail' && $section != 'contact')
 		{
 			// We don't know other sections

administrator/components/com_contact/views/contact/tmpl/edit.php

@@ -58,7 +58,7 @@
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::_('COM_CONTACT_EDIT_CONTACT')); ?>
 		<div class="row-fluid">
 			<div class="span9">
-				<div class="row-fluid form-horizontal-desktop">
+				<div class="row-fluid form-horizontal-desktop float-cols" >
 					<div class="span6">
 						<?php echo $this->form->renderField('user_id'); ?>
 						<?php echo $this->form->renderField('image'); ?>

administrator/components/com_content/models/article.php

@@ -525,7 +525,7 @@ public function save($data)
 			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
 		}
 
-		// Save New Categoryg
+		// Save New Category
 		if ($catid == 0 && $this->canCreateCategory())
 		{
 			$table = array();