Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ports to 5.15 #14935

Merged
merged 2 commits into from
Jul 31, 2019
Merged

ports to 5.15 #14935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca33fb
mysqli_get_client_info() does not have a parameter - fixes https://la…
mfb Jul 23, 2019
4feaa6f
Update Confirm.tpl
Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Utils/Check/Component/Env.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Civi/Install/Requirements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion install/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 2 additions & 6 deletions templates/CRM/Contribute/Form/Contribution/Confirm.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down