Merge branch '3.10-dev' into template_check

administrator/components/com_admin/models/sysinfo.php

@@ -527,6 +527,7 @@ public function getDirectory($public = false)
 		$cparams  = JComponentHelper::getParams('com_media');
 
 		$this->addDirectory('administrator/components', JPATH_ADMINISTRATOR . '/components');
+		$this->addDirectory('administrator/components/com_joomlaupdate', JPATH_ADMINISTRATOR . '/components/com_joomlaupdate');
 		$this->addDirectory('administrator/language', JPATH_ADMINISTRATOR . '/language');
 
 		// List all admin languages

administrator/components/com_admin/sql/updates/sqlazure/3.10.1-2021-08-17.sql

@@ -0,0 +1,6 @@
+--
+-- These database columns are not used in Joomla 3.10 but will be used in Joomla 4.
+-- They are added to 3.10 because otherwise the update to 4 will fail.
+--
+ALTER TABLE [#__template_styles] ADD [inheritable] [smallint] NOT NULL DEFAULT 0;
+ALTER TABLE [#__template_styles] ADD [parent] [nvarchar](50) NOT NULL DEFAULT '';

administrator/components/com_installer/models/update.php

@@ -246,7 +246,7 @@ public function getDisabledUpdateSites()
 	 * Finds updates for an extension.
 	 *
 	 * @param   int  $eid               Extension identifier to look for
-	 * @param   int  $cacheTimeout      Cache timout
+	 * @param   int  $cacheTimeout      Cache timeout
 	 * @param   int  $minimumStability  Minimum stability for updates {@see JUpdater} (0=dev, 1=alpha, 2=beta, 3=rc, 4=stable)
 	 *
 	 * @return  boolean Result

administrator/components/com_joomlaupdate/joomlaupdate.xml

@@ -7,15 +7,14 @@
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.6.2</version>
+	<version>3.10.1</version>
 	<description>COM_JOOMLAUPDATE_XML_DESCRIPTION</description>
 	<media destination="com_joomlaupdate" folder="media">
 		<folder>js</folder>
 	</media>
 	<administration>
 		<menu img="class:joomlaupdate">com_joomlaupdate</menu>
 		<files folder="admin">
-			<filename>access.xml</filename>
 			<filename>config.xml</filename>
 			<filename>controller.php</filename>
 			<filename>joomlaupdate.php</filename>

administrator/components/com_joomlaupdate/models/default.php

@@ -46,7 +46,6 @@ public function applyUpdateSite()
 		switch ($params->get('updatesource', 'nochange'))
 		{
 			// "Minor & Patch Release for Current version AND Next Major Release".
-			case 'sts':
 			case 'next':
 				$updateURL = 'https://update.joomla.org/core/sts/list_sts.xml';
 				break;
@@ -74,6 +73,7 @@ public function applyUpdateSite()
 			 * The commented "case" below are for documenting where 'default' and legacy options falls
 			 * case 'default':
 			 * case 'lts':
+			 * case 'sts': (It's shown as "Default" because that option does not exist any more)
 			 * case 'nochange':
 			 */
 			default:
@@ -1475,8 +1475,10 @@ public function getNonCoreExtensions()
 		{
 			$decode = json_decode($extension->manifest_cache);
 
-			// Removed description so that CDATA content does not cause javascript error during pre-update check
+			// Remove unused fields so they do not cause javascript errors during pre-update check
 			unset($decode->description);
+			unset($decode->copyright);
+			unset($decode->creationDate);
 
 			$this->translateExtensionName($extension);
 			$extension->version = isset($decode->version)
@@ -1549,8 +1551,10 @@ public function getNonCorePlugins($folderFilter = array())
 		{
 			$decode = json_decode($plugin->manifest_cache);
 
-			// Removed description so that CDATA content does not cause javascript error during pre-update check
-			$decode->description = '';
+			// Remove unused fields so they do not cause javascript errors during pre-update check
+			unset($decode->description);
+			unset($decode->copyright);
+			unset($decode->creationDate);
 
 			$this->translateExtensionName($plugin);
 			$plugin->version = isset($decode->version)

administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php

@@ -228,7 +228,7 @@
 				</table>
 			</td>
 		</tr>
-		<tr id="preupdatecheckbox" >
+		<tr id="preupdatecheckbox">
 			<td>
 				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION'); ?>
 			</td>

administrator/components/com_joomlaupdate/views/default/view.html.php

@@ -104,7 +104,7 @@ public function display($tpl = null)
 		$this->isBackendTemplateIsis  = (bool) $model->isTemplateActive('isis');
 
 		// Disable the critical plugins check for non-major updates.
-		$this->nonCoreCriticalPlugins = false;
+		$this->nonCoreCriticalPlugins = array();
 
 		if (version_compare($this->updateInfo['latest'], '4', '>='))
 		{
@@ -136,7 +136,6 @@ public function display($tpl = null)
 		switch ($params->get('updatesource', 'default'))
 		{
 			// "Minor & Patch Release for Current version AND Next Major Release".
-			case 'sts':
 			case 'next':
 				$this->langKey         = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT';
 				$this->updateSourceKey = JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT');
@@ -159,6 +158,7 @@ public function display($tpl = null)
 			 * The commented "case" below are for documenting where 'default' and legacy options falls
 			 * case 'default':
 			 * case 'lts':
+			 * case 'sts':
 			 * case 'nochange':
 			 */
 			default:
@@ -268,8 +268,11 @@ private function checkForSelfUpdate()
 	 */
 	public function shouldDisplayPreUpdateCheck()
 	{
-		return isset($this->updateInfo['object']->downloadurl->_data)
-			&& $this->getModel()->isDatabaseTypeSupported()
-			&& $this->getModel()->isPhpVersionSupported();
+		$nextMinor = JVersion::MAJOR_VERSION . '.' . (JVersion::MINOR_VERSION + 1);
+
+		// Show only when we found a download URL, we have an update and when we update to the next minor or greater.
+		return $this->updateInfo['hasUpdate']
+				&& version_compare($this->updateInfo['latest'], $nextMinor, '>=');
 	}
 }
+

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

@@ -111,8 +111,8 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla version, %s."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to download that update. There are three possibilities why this happens:<br>- Your host doesn't support <a href="_QQ_"https://downloads.joomla.org/technical-requirements"_QQ_">the minimum requirements for Joomla %1$s</a> and there is no alternative download for your configuration available.<br>- The update to Joomla %1$s is not available for your stability level.<br>- There is a problem with the Joomla Update Server.<br><br>Please try to download the update package from <a href="_QQ_"https://downloads.joomla.org/latest"_QQ_">the official Joomla download page</a> and use the Upload and Update tab."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="Live Update is not available"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="There is a new version of the Joomla Update Component that needs to be installed first. <a class=\"alert-link\" href="_QQ_"index.php?option=com_installer&view=update"_QQ_">Click here to update the component</a>."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="A new version of the Joomla Update Component is available."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="You must update this first before you can update Joomla! <a class=\"alert-link\" href="_QQ_"index.php?option=com_installer&view=update"_QQ_">Click here to update the component</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK="Pre-Update Check for Joomla %s"

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

@@ -677,7 +677,7 @@ JLIB_LOGIN_EXPIRED="Your authentication has expired."
 
 JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
-JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
+JLIB_MAIL_INVALID_EMAIL_SENDER="Invalid email sender: %s"
 
 JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."

administrator/language/en-GB/en-GB.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.9" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.10.1</version>
+	<version>3.10.2</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

administrator/language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension version="3.9" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.10.1</version>
+	<version>3.10.2</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

administrator/manifests/files/joomla.xml

@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.10.1-dev</version>
+	<version>3.10.2-dev</version>
 	<creationDate>August 2021</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

administrator/manifests/packages/pkg_en-GB.xml

@@ -2,7 +2,7 @@
 <extension type="package" version="3.9" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.10.1.1</version>
+	<version>3.10.2.1</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

installation/language/cy-GB/cy-GB.ini

@@ -22,7 +22,7 @@ INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Gosodiadau a argymhellir:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Argymhellir y gosodiadau yma ar gyfer PHP i sicrhau cydnawsedd llwyr efo Joomla!.<br />Serch hynny, bydd Joomla! yn gweithio os nad yw eich gosodiadau yn llwyr gyfateb efo’r ffurfweddiad sy’n cael ei argymell."
 INSTL_PRECHECK_DIRECTIVE="Cyfarwyddeb"
 INSTL_PRECHECK_RECOMMENDED="Argymhellwyd"
-INSTL_PRECHECK_ACTUAL="Gwirioneddol"
+INSTL_PRECHECK_ACTUAL="Gweithredol"
 ; Database view
 INSTL_DATABASE="Ffurfweddiad cronfa ddata"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Ymholiad cronfa ddata PostgreSQL wedi methu."

installation/language/en-GB/en-GB.xml

@@ -3,7 +3,7 @@
 	version="3.9"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.10.1</version>
+	<version>3.10.2</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/sk-SK/sk-SK.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.10" client="installation">
 	<name>Slovenčina (Slovak)</name>
-	<version>3.10.0</version>
+	<version>3.10.1</version>
 	<creationDate>August 2021</creationDate>
 	<author>Slovak translation team : Peter Michnica</author>
 	<copyright>(C) 2007 Open Source Matters, Inc.</copyright>

installation/sql/sqlazure/joomla.sql

@@ -2579,6 +2579,8 @@ CREATE TABLE "#__template_styles" (
   "client_id" tinyint NOT NULL DEFAULT 0,
   "home" nvarchar(7) NOT NULL DEFAULT '0',
   "title" nvarchar(255) NOT NULL DEFAULT '',
+  "inheritable" smallint NOT NULL DEFAULT 0,
+  "parent" nvarchar(50) NOT NULL DEFAULT '',
   "params" nvarchar(max) NOT NULL,
  CONSTRAINT "PK_#__template_styles_id" PRIMARY KEY CLUSTERED
 (

language/en-GB/en-GB.lib_joomla.ini

@@ -677,7 +677,7 @@ JLIB_LOGIN_EXPIRED="Your authentication has expired."
 
 JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
-JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
+JLIB_MAIL_INVALID_EMAIL_SENDER="Invalid email sender: %s"
 
 JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."

language/en-GB/en-GB.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.9" client="site">
 	<name>English (en-GB)</name>
-	<version>3.10.1</version>
+	<version>3.10.2</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension version="3.9" client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.10.1</version>
+	<version>3.10.2</version>
 	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

libraries/src/Filter/InputFilter.php

@@ -508,7 +508,7 @@ public static function isSafeFile($file, $options = array())
 
 			// Which file extensions to scan for short tags
 			'shorttag_extensions'        => array(
-				'inc', 'phps', 'class', 'php3', 'php4', 'php5', 'txt', 'dat', 'tpl', 'tmpl',
+				'inc', 'phps', 'class', 'php3', 'php4', 'php5', 'php6', 'php7', 'php8', 'txt', 'dat', 'tpl', 'tmpl',
 			),
 
 			// Forbidden extensions anywhere in the content

libraries/src/Http/Transport/SocketTransport.php

@@ -297,7 +297,7 @@ protected function connect(Uri $uri, $timeout = null)
 			if (!$php_errormsg)
 			{
 				// Error but nothing from php? Create our own
-				$php_errormsg = sprintf('Could not connect to resource: %s', $uri, $err, $errno);
+				$php_errormsg = sprintf('Could not connect to resource %s: %s (error code %d)', $uri, $err, $errno);
 			}
 
 			// Restore error tracking to give control to the exception handler

libraries/src/Mail/Mail.php

@@ -239,7 +239,7 @@ public function setSender($from)
 				// If it is neither, we log a message and throw an exception
 				Log::add(\JText::sprintf('JLIB_MAIL_INVALID_EMAIL_SENDER', $from), Log::WARNING, 'jerror');
 
-				throw new \UnexpectedValueException(sprintf('Invalid email Sender: %s, Mail::setSender(%s)', $from));
+				throw new \UnexpectedValueException(sprintf('Invalid email sender: %s', $from));
 			}
 
 			// Check for boolean false return if exception handling is disabled

libraries/src/Version.php

@@ -49,7 +49,7 @@ final class Version
 	 * @var    integer
 	 * @since  3.8.0
 	 */
-	const PATCH_VERSION = 1;
+	const PATCH_VERSION = 2;
 
 	/**
 	 * Extra release version info.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '1-dev';
+	const DEV_LEVEL = '2-dev';
 
 	/**
 	 * Development status.
@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '14-August-2021';
+	const RELDATE = '22-August-2021';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '12:25';
+	const RELTIME = '18:42';
 
 	/**
 	 * Release timezone.

plugins/system/updatenotification/postinstall/updatecachetime.php

@@ -28,7 +28,7 @@ function updatecachetime_postinstall_condition()
 }
 
 /**
- * Sets the cachtimeout back to the default (6 hours)
+ * Sets the cachetimeout back to the default (6 hours)
  *
  * @return  void
  *
@@ -38,7 +38,7 @@ function updatecachetime_postinstall_action()
 {
 	$installer = JComponentHelper::getComponent('com_installer');
 
-	// Sets the cachtimeout back to the default (6 hours)
+	// Sets the cachetimeout back to the default (6 hours)
 	$installer->params->set('cachetimeout', 6);
 
 	// Save the new parameters back to com_installer