Merge pull request #14935 from eileenmcnaughton/515

ports to 5.15
civicrm · Jul 31, 2019 · 230f015 · 230f015
2 parents b330ddb + 4feaa6f
commit 230f015
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 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);

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -296,13 +296,9 @@
     <div class="messages status continue_instructions-section">
       <p>
         {if $is_pay_later OR $amount LE 0.0}
-          {ts 1=$button}Your transaction will not be completed until you click the
-            <strong>%1</strong>
-            button. Please click the button one time only.{/ts}
+          {ts 1=$button}Your transaction will not be completed until you click the <strong>%1</strong> button. Please click the button one time only.{/ts}
         {else}
-          {ts 1=$button}Your contribution will not be completed until you click the
-            <strong>%1</strong>
-            button. Please click the button one time only.{/ts}
+          {ts 1=$button}Your contribution will not be completed until you click the <strong>%1</strong> button. Please click the button one time only.{/ts}
         {/if}
       </p>
     </div>