Fix serverClaimsUtf8mb4Support()

As previously defined, the method could return true even when $client_version < 5.5.3 (for non-mysqlnd clients).
roland-d · Nov 21, 2015 · 90bb176 · 90bb176
1 parent 240cdca
commit 90bb176
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
@@ -510,17 +510,24 @@ private function hasProfiling()
 	private function serverClaimsUtf8mb4Support()
 	{
 		$client_version = mysql_get_client_info();
-		$server_support = version_compare($this->getVersion(), '5.5.3', '>=');
+		$server_version = $this->getVersion();
 
-		if (strpos($client_version, 'mysqlnd') !== false && $server_support)
+		if (version_compare($server_version, '5.5.3', '<'))
 		{
-			$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
-
-			return version_compare($client_version, '5.0.9', '>=');
+			return false;
 		}
 		else
 		{
-			return $server_support;
+			if (strpos($client_version, 'mysqlnd') !== false)
+			{
+				$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+				return version_compare($client_version, '5.0.9', '>=');
+			}
+			else
+			{
+				return version_compare($client_version, '5.5.3', '>=');
+			}
 		}
 	}
 

diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
@@ -952,17 +952,24 @@ private function hasProfiling()
 	private function serverClaimsUtf8mb4Support()
 	{
 		$client_version = mysqli_get_client_info();
-		$server_support = version_compare($this->getVersion(), '5.5.3', '>=');
+		$server_version = $this->getVersion();
 
-		if (strpos($client_version, 'mysqlnd') !== false && $server_support)
+		if (version_compare($server_version, '5.5.3', '<'))
 		{
-			$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
-
-			return version_compare($client_version, '5.0.9', '>=');
+			return false;
 		}
 		else
 		{
-			return $server_support;
+			if (strpos($client_version, 'mysqlnd') !== false)
+			{
+				$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+				return version_compare($client_version, '5.0.9', '>=');
+			}
+			else
+			{
+				return version_compare($client_version, '5.5.3', '>=');
+			}
 		}
 	}