mysql: set connection charset to utf-8

17 years ago · 70dcff6b3d
parent 981e8107ca
commit 70dcff6b3d
6 changed files with 19 additions and 1 deletions
--- a/backend.php
+++ b/backend.php
@ -49,6 +49,9 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query("set client_encoding = 'UTF-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}

 	$op = $_REQUEST["op"];
--- a/opml.php
+++ b/opml.php
@ -13,6 +13,9 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query($link, "set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}

 	login_sequence($link);
--- a/update.php
+++ b/update.php
@ -13,8 +13,11 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query($link, "set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}
-	
+
 	login_sequence($link);
 	
 	$owner_uid = $_SESSION["uid"];
--- a/update_daemon.php
+++ b/update_daemon.php
@ -65,6 +65,9 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}

 	$last_purge = 0;
--- a/update_feeds.php
+++ b/update_feeds.php
@ -26,6 +26,9 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}

 	$result = db_query($link, "SELECT id FROM ttrss_users");
--- a/xml-rpc.php
+++ b/xml-rpc.php
@ -22,6 +22,9 @@
 	if (DB_TYPE == "pgsql") {
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
+	} else {
+		db_query($link, "SET NAMES utf8");
+		db_query($link, "SET CHARACTER SET utf8");
 	}

 	function getVirtualFeeds($msg) {