D19464.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19464.diff
View Options

	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
	@@ -6,6 +6,8 @@
	final class AphrontMySQLiDatabaseConnection
	extends AphrontBaseMySQLDatabaseConnection {

	+ private $connectionOpen = false;
	+
	public function escapeUTF8String($string) {
	$this->validateUTF8String($string);
	return $this->escapeBinaryString($string);
	@@ -24,7 +26,10 @@
	}

	protected function closeConnection() {
	- $this->requireConnection()->close();
	+ if ($this->connectionOpen) {
	+ $this->requireConnection()->close();
	+ $this->connectionOpen = false;
	+ }
	}

	protected function connect() {
	@@ -76,6 +81,8 @@
	$this->throwConnectionException($errno, $error, $user, $host);
	}

	+ $this->connectionOpen = true;
	+
	$ok = @$conn->set_charset('utf8mb4');
	if (!$ok) {
	$ok = $conn->set_charset('binary');