Merge branch 'staging' into fix-schema-updates-3.9.8-2019-06-15

joomla · Jun 23, 2019 · 3eb5986 · 3eb5986
2 parents 5372fe8 + 27ea0dc
commit 3eb5986
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php
@@ -324,14 +324,22 @@ protected function getRenderer($layoutId = 'default')
 	 */
 	private function getStatsData()
 	{
-		return array(
+		$data = array(
 			'unique_id'   => $this->getUniqueId(),
 			'php_version' => PHP_VERSION,
 			'db_type'     => $this->db->name,
 			'db_version'  => $this->db->getVersion(),
 			'cms_version' => JVERSION,
 			'server_os'   => php_uname('s') . ' ' . php_uname('r')
 		);
+
+		// Check if we have a MariaDB version string and extract the proper version from it
+		if (preg_match('/^(?:5\.5\.5-)?(mariadb-)?(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)/i', $data['db_version'], $versionParts))
+		{
+			$data['db_version'] = $versionParts['major'] . '.' . $versionParts['minor'] . '.' . $versionParts['patch'];
+		}
+
+		return $data;
 	}
 
 	/**