D10623.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10623.id.diff
View Options

	diff --git a/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php b/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	--- a/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	+++ b/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	@@ -72,7 +72,7 @@
	}
	}

	- $ok = mysql_set_charset('utf8mb4', $conn);
	+ $ok = @mysql_set_charset('utf8mb4', $conn);
	if (!$ok) {
	mysql_set_charset('utf8', $conn);
	}
	diff --git a/src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php b/src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	--- a/src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	+++ b/src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	@@ -67,7 +67,7 @@
	"#{$errno}: {$error}.", $errno);
	}

	- $ok = $conn->set_charset('utf8mb4');
	+ $ok = @$conn->set_charset('utf8mb4');
	if (!$ok) {
	$ok = $conn->set_charset('utf8');
	}