Merge pull request #14931 from eileenmcnaughton/mysql516

mysqli_get_client_info() does not have a parameter - fixes https://lab.civicrm.org/dev/core/issues/1136
civicrm · Jul 31, 2019 · 09dd2e5 · 09dd2e5
2 parents 97aa859 + e479ac6
commit 09dd2e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
@@ -920,7 +920,7 @@ public function checkMysqlUtf8mb4() {
       );
     }
     // Ensure that the MySQL driver supports utf8mb4 encoding.
-    $version = mysqli_get_client_info(CRM_Core_DAO::getConnection()->connection);
+    $version = mysqli_get_client_info();
     if (strpos($version, 'mysqlnd') !== FALSE) {
       // The mysqlnd driver supports utf8mb4 starting at version 5.0.9.
       $version = preg_replace('/^\D+([\d.]+).*/', '$1', $version);

diff --git a/Civi/Install/Requirements.php b/Civi/Install/Requirements.php
@@ -624,7 +624,7 @@ public function checkMysqlUtf8mb4($db_config) {
     mysqli_query($conn, 'DROP TABLE civicrm_utf8mb4_test');
 
     // Ensure that the MySQL driver supports utf8mb4 encoding.
-    $version = mysqli_get_client_info($conn);
+    $version = mysqli_get_client_info();
     if (strpos($version, 'mysqlnd') !== FALSE) {
       // The mysqlnd driver supports utf8mb4 starting at version 5.0.9.
       $version = preg_replace('/^\D+([\d.]+).*/', '$1', $version);

diff --git a/install/index.php b/install/index.php
@@ -1421,7 +1421,7 @@ public function requireMysqlUtf8mb4($server, $username, $password, $database, $t
     $result = mysqli_query($conn, 'DROP TABLE civicrm_utf8mb4_test');
 
     // Ensure that the MySQL driver supports utf8mb4 encoding.
-    $version = mysqli_get_client_info($conn);
+    $version = mysqli_get_client_info();
     if (strpos($version, 'mysqlnd') !== FALSE) {
       // The mysqlnd driver supports utf8mb4 starting at version 5.0.9.
       $version = preg_replace('/^\D+([\d.]+).*/', '$1', $version);