Merge branch 'staging' into patch-1

administrator/components/com_templates/models/template.php

@@ -330,8 +330,8 @@ protected function fixTemplateName()
 
 		foreach ($files as $file)
 		{
-			$newFile = str_replace($oldName, $newName, $file);
-			$result = JFile::move($file, $newFile) && $result;
+			$newFile = '/' . str_replace($oldName, $newName, basename($file));
+			$result  = JFile::move($file, dirname($file) . $newFile) && $result;
 		}
 
 		// Edit XML file

administrator/templates/isis/css/template-rtl.css

@@ -9111,11 +9111,13 @@ input:focus,
 	column-gap: 15px;
 }
 #menu-assignment .menu-links > li {
+	display: inline-block;
 	vertical-align: top;
 	margin-bottom: 15px;
 	width: 100%;
 	list-style: none;
 	page-break-inside: avoid;
+	break-inside: avoid;
 }
 #menu-assignment .menu-links-block {
 	background-color: #fafafa;

administrator/templates/isis/css/template.css

@@ -9111,11 +9111,13 @@ input:focus,
 	column-gap: 15px;
 }
 #menu-assignment .menu-links > li {
+	display: inline-block;
 	vertical-align: top;
 	margin-bottom: 15px;
 	width: 100%;
 	list-style: none;
 	page-break-inside: avoid;
+	break-inside: avoid;
 }
 #menu-assignment .menu-links-block {
 	background-color: #fafafa;

administrator/templates/isis/less/pages/_com_templates.less

@@ -12,11 +12,13 @@
 		-webkit-column-gap: 15px;
 		column-gap: 15px;
 		> li {
+			display: inline-block;
 			vertical-align: top;
 			margin-bottom: 15px;
 			width: 100%;
 			list-style: none;
 			page-break-inside: avoid;
+			break-inside: avoid;
 		}
 	}
 	.menu-links-block {

components/com_contact/views/category/tmpl/default.xml

@@ -327,6 +327,17 @@
 
 		<fieldset name="contact" label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
 			addfieldpath="/administrator/components/com_fields/models/fields">
+
+			<field
+				name="contact_layout"
+				type="componentlayout"
+				label="JGLOBAL_FIELD_LAYOUT_LABEL"
+				description="JGLOBAL_FIELD_LAYOUT_DESC"
+				menuitems="true"
+				extension="com_contact"
+				view="contact"
+			/>
+
 			<field
 				name="presentation_style"
 				type="list"

libraries/joomla/github/http.php

@@ -20,19 +20,25 @@
 class JGithubHttp extends JHttp
 {
 	/**
-	 * @const  integer  Use no authentication for HTTP connections.
+	 * Use no authentication for HTTP connections.
+	 *
+	 * @var    integer
 	 * @since  1.7.3
 	 */
 	const AUTHENTICATION_NONE = 0;
 
 	/**
-	 * @const  integer  Use basic authentication for HTTP connections.
+	 * Use basic authentication for HTTP connections.
+	 *
+	 * @var    integer
 	 * @since  1.7.3
 	 */
 	const AUTHENTICATION_BASIC = 1;
 
 	/**
-	 * @const  integer  Use OAuth authentication for HTTP connections.
+	 * Use OAuth authentication for HTTP connections.
+	 *
+	 * @var    integer
 	 * @since  1.7.3
 	 */
 	const AUTHENTICATION_OAUTH = 2;

libraries/src/Authentication/Authentication.php

@@ -22,44 +22,50 @@ class Authentication extends \JObject
 	// Shared success status
 	/**
 	 * This is the status code returned when the authentication is success (permit login)
-	 * @const  STATUS_SUCCESS successful response
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_SUCCESS = 1;
 
 	// These are for authentication purposes (username and password is valid)
 	/**
 	 * Status to indicate cancellation of authentication (unused)
-	 * @const  STATUS_CANCEL cancelled request (unused)
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_CANCEL = 2;
 
 	/**
 	 * This is the status code returned when the authentication failed (prevent login if no success)
-	 * @const  STATUS_FAILURE failed request
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_FAILURE = 4;
 
 	// These are for authorisation purposes (can the user login)
 	/**
 	 * This is the status code returned when the account has expired (prevent login)
-	 * @const  STATUS_EXPIRED an expired account (will prevent login)
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_EXPIRED = 8;
 
 	/**
 	 * This is the status code returned when the account has been denied (prevent login)
-	 * @const  STATUS_DENIED denied request (will prevent login)
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_DENIED = 16;
 
 	/**
 	 * This is the status code returned when the account doesn't exist (not an error)
-	 * @const  STATUS_UNKNOWN unknown account (won't permit or prevent login)
+	 *
+	 * @var    integer
 	 * @since  1.7.0
 	 */
 	const STATUS_UNKNOWN = 32;

libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php

@@ -25,7 +25,7 @@ final class HttpBridgePostRequestMethod implements RequestMethod
 	/**
 	 * URL to which requests are sent.
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.9.0
 	 */
 	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';

libraries/src/Helper/UserGroupsHelper.php

@@ -18,13 +18,17 @@
 final class UserGroupsHelper
 {
 	/**
-	 * @const  integer
+	 * Indicates the current helper instance is the singleton instance.
+	 *
+	 * @var    integer
 	 * @since  3.6.3
 	 */
 	const MODE_SINGLETON = 1;
 
 	/**
-	 * @const  integer
+	 * Indicates the current helper instance is a standalone class instance.
+	 *
+	 * @var    integer
 	 * @since  3.6.3
 	 */
 	const MODE_INSTANCE = 2;

libraries/src/Language/LanguageStemmer.php

@@ -13,7 +13,8 @@
 /**
  * Stemmer base class.
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  4.0 Use wamania/php-stemmer
  */
 abstract class LanguageStemmer
 {

libraries/src/Language/Stemmer/Porteren.php

@@ -19,7 +19,8 @@
  * This class was adapted from one written by Richard Heyes.
  * See copyright and link information above.
  *
- * @since  3.0.0
+ * @since       3.0.0
+ * @deprecated  4.0 Use wamania/php-stemmer
  */
 class Porteren extends LanguageStemmer
 {

libraries/src/Mail/Mail.php

@@ -64,6 +64,17 @@ public function __construct($exceptions = true)
 
 		// Don't disclose the PHPMailer version
 		$this->XMailer = ' ';
+
+		/*
+		 * PHPMailer 5.2 can't validate e-mail addresses with the new regex library used in PHP 7.3+
+		 * Setting $validator to "php" uses the native php function filter_var
+		 *
+		 * @see https://github.com/joomla/joomla-cms/issues/24707
+		 */
+		if (version_compare(PHP_VERSION, '7.3.0', '>='))
+		{
+			\PHPMailer::$validator = 'php';
+		}
 	}
 
 	/**

libraries/src/Updater/DownloadSource.php

@@ -20,47 +20,47 @@ class DownloadSource
 	/**
 	 * Defines a BZIP2 download package
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.4
 	 */
 	const FORMAT_TAR_BZIP = 'bz2';
 
 	/**
 	 * Defines a TGZ download package
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.4
 	 */
 	const FORMAT_TAR_GZ = 'gz';
 
 	/**
 	 * Defines a ZIP download package
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.3
 	 */
 	const FORMAT_ZIP = 'zip';
 
 	/**
 	 * Defines a full package download type
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.3
 	 */
 	const TYPE_FULL = 'full';
 
 	/**
 	 * Defines a patch package download type
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.4
 	 */
 	const TYPE_PATCH = 'patch';
 
 	/**
 	 * Defines an upgrade package download type
 	 *
-	 * @const  string
+	 * @var    string
 	 * @since  3.8.4
 	 */
 	const TYPE_UPGRADE = 'upgrade';

libraries/src/Updater/Updater.php

@@ -28,45 +28,47 @@ class Updater extends \JAdapter
 	/**
 	 * Development snapshots, nightly builds, pre-release versions and so on
 	 *
-	 * @const  integer
+	 * @var    integer
 	 * @since  3.4
 	 */
 	const STABILITY_DEV = 0;
 
 	/**
 	 * Alpha versions (work in progress, things are likely to be broken)
 	 *
-	 * @const  integer
+	 * @var    integer
 	 * @since  3.4
 	 */
 	const STABILITY_ALPHA = 1;
 
 	/**
 	 * Beta versions (major functionality in place, show-stopper bugs are likely to be present)
 	 *
-	 * @const  integer
+	 * @var    integer
 	 * @since  3.4
 	 */
 	const STABILITY_BETA = 2;
 
 	/**
 	 * Release Candidate versions (almost stable, minor bugs might be present)
 	 *
-	 * @const  integer
+	 * @var    integer
 	 * @since  3.4
 	 */
 	const STABILITY_RC = 3;
 
 	/**
 	 * Stable versions (production quality code)
 	 *
-	 * @const  integer
+	 * @var    integer
 	 * @since  3.4
 	 */
 	const STABILITY_STABLE = 4;
 
 	/**
-	 * @var    Updater  Updater instance container.
+	 * Updater instance container.
+	 *
+	 * @var    Updater
 	 * @since  1.7.3
 	 */
 	protected static $instance;

plugins/finder/content/content.php

@@ -344,6 +344,7 @@ protected function getListQuery($query = null)
 		// Check if we can use the supplied SQL query.
 		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
 			->select('a.id, a.title, a.alias, a.introtext AS summary, a.fulltext AS body')
+			->select('a.images')
 			->select('a.state, a.catid, a.created AS start_date, a.created_by')
 			->select('a.created_by_alias, a.modified, a.modified_by, a.attribs AS params')
 			->select('a.metakey, a.metadesc, a.metadata, a.language, a.access, a.version, a.ordering')

plugins/system/stats/stats.php

@@ -21,19 +21,25 @@
 class PlgSystemStats extends JPlugin
 {
 	/**
-	 * @const  integer
+	 * Indicates sending statistics is always allowed.
+	 *
+	 * @var    integer
 	 * @since  3.5
 	 */
 	const MODE_ALLOW_ALWAYS = 1;
 
 	/**
-	 * @const  integer
+	 * Indicates sending statistics is only allowed one time.
+	 *
+	 * @var    integer
 	 * @since  3.5
 	 */
 	const MODE_ALLOW_ONCE = 2;
 
 	/**
-	 * @const  integer
+	 * Indicates sending statistics is never allowed.
+	 *
+	 * @var    integer
 	 * @since  3.5
 	 */
 	const MODE_ALLOW_NEVER = 3;