From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 21 Aug 2007 05:35:24 +0000 (+0100)
Subject: mysql: disable utf8
X-Git-Tag: 1.2.14.1~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c1879099e1a7782842d52ad4eed082e2e713ff85;p=tt-rss.git

mysql: disable utf8
---

diff --git a/backend.php b/backend.php
index c5757a2f..bbfa8ca2 100644
--- a/backend.php
+++ b/backend.php
@@ -50,8 +50,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$op = $_REQUEST["op"];
diff --git a/opml.php b/opml.php
index ac236a64..f5655cb3 100644
--- a/opml.php
+++ b/opml.php
@@ -14,8 +14,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	login_sequence($link);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 28e3b4ef..e55038b7 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -1,5 +1,5 @@
-SET NAMES utf8;
-SET CHARACTER SET utf8;
+-- SET NAMES utf8;
+-- SET CHARACTER SET utf8;
 
 drop table if exists ttrss_version;
 drop table if exists ttrss_labels;
diff --git a/update.php b/update.php
index e15e3be0..e74e3e8f 100644
--- a/update.php
+++ b/update.php
@@ -14,8 +14,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	login_sequence($link);
diff --git a/update_daemon.php b/update_daemon.php
index 25ef6a99..c2738e48 100644
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -66,8 +66,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$last_purge = 0;
diff --git a/update_feeds.php b/update_feeds.php
index aa07321e..2fd74ef1 100644
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -27,8 +27,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$result = db_query($link, "SELECT id FROM ttrss_users");
diff --git a/xml-rpc.php b/xml-rpc.php
index d61382c0..21237f6c 100644
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -23,8 +23,8 @@
 		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");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	function getVirtualFeeds($msg) {