Merge branch '3.10-dev' into reg3

joomla · Feb 15, 2022 · fbe9d96 · fbe9d96
2 parents 145132b + eb73d1f
commit fbe9d96
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
@@ -1439,6 +1439,11 @@ public function process()
 			@touch($this->filename, $this->timestamp);
 		}
 
+		if (substr($this->filename, -4) === '.php')
+		{
+			$this->clearFileInOPCache($this->filename);
+		}
+
 		return true;
 	}
 

diff --git a/administrator/language/en-GB/en-GB.xml b/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.6</version>
+	<version>3.10.7</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/install.xml b/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.6</version>
+	<version>3.10.7</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/manifests/files/joomla.xml b/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.6-rc2-dev</version>
+	<version>3.10.7-dev</version>
 	<creationDate>February 2022</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/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.6.1</version>
+	<version>3.10.7.1</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -3,7 +3,7 @@
 	version="3.9"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.10.6</version>
+	<version>3.10.7</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/language/en-GB/en-GB.xml b/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.6</version>
+	<version>3.10.7</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/language/en-GB/install.xml b/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.6</version>
+	<version>3.10.7</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -49,7 +49,7 @@ final class Version
 	 * @var    integer
 	 * @since  3.8.0
 	 */
-	const PATCH_VERSION = 6;
+	const PATCH_VERSION = 7;
 
 	/**
 	 * Extra release version info.
@@ -60,7 +60,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'rc2-dev';
+	const EXTRA_VERSION = 'dev';
 
 	/**
 	 * Release version.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '6-rc2-dev';
+	const DEV_LEVEL = '7-dev';
 
 	/**
 	 * Development status.
@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '6-February-2022';
+	const RELDATE = '12-February-2022';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '13:45';
+	const RELTIME = '19:00';
 
 	/**
 	 * Release timezone.