From cca33fb0106a18b61068ea75c30150a3eed6deb2 Mon Sep 17 00:00:00 2001 From: mark burdett Date: Tue, 23 Jul 2019 12:38:55 -0700 Subject: [PATCH 1/2] 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 66188f45018c..db4240608f87 100644 --- 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 index e7c9581106cb..63b6cb05522e 100644 --- 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 index 9d86c115e185..47a8d6f2d977 100644 --- 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); From 4feaa6f794076345cece5324b848aa203afdf4ad Mon Sep 17 00:00:00 2001 From: Detlev Date: Fri, 28 Jun 2019 09:35:31 +0000 Subject: [PATCH 2/2] Update Confirm.tpl --- templates/CRM/Contribute/Form/Contribution/Confirm.tpl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 3fdb9310659e..780346e2754e 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -296,13 +296,9 @@

{if $is_pay_later OR $amount LE 0.0} - {ts 1=$button}Your transaction will not be completed until you click the - %1 - button. Please click the button one time only.{/ts} + {ts 1=$button}Your transaction will not be completed until you click the %1 button. Please click the button one time only.{/ts} {else} - {ts 1=$button}Your contribution will not be completed until you click the - %1 - button. Please click the button one time only.{/ts} + {ts 1=$button}Your contribution will not be completed until you click the %1 button. Please click the button one time only.{/ts} {/if}