From cca33fb0106a18b61068ea75c30150a3eed6deb2 Mon Sep 17 00:00:00 2001
From: mark burdett <mfburdett@gmail.com>
Date: Tue, 23 Jul 2019 12:38:55 -0700
Subject: [PATCH] mysqli_get_client_info() does not have a parameter - fixes
https://lab.civicrm.org/dev/core/issues/1136
---
CRM/Utils/Check/Component/Env.php | 2 +-
Civi/Install/Requirements.php | 2 +-
install/index.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index 66188f45018..db4240608f8 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -920,7 +920,7 @@ class CRM_Utils_Check_Component_Env extends CRM_Utils_Check_Component {
);
}
// 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
index e7c9581106c..63b6cb05522 100644
--- a/Civi/Install/Requirements.php
+++ b/Civi/Install/Requirements.php
@@ -624,7 +624,7 @@ class Requirements {
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
index 9d86c115e18..47a8d6f2d97 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1421,7 +1421,7 @@ class InstallRequirements {
$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);
--
GitLab