mysql: disable utf8

diff --git a/backend.php b/backend.php
index c5757a2ff13b5960d99007d17e44aa7448dbd857..bbfa8ca233cf3eba48f95101a48540bd1bd8cc3d 100644 (file)
--- 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 ac236a64b60d8d060ea4f7b3895a6425d517452c..f5655cb31bd0d4304189bdeb7b29ba2f0db846f7 100644 (file)
--- 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 28e3b4efdc5bb0e02de4aefef1f9f852bb5440e4..e55038b7fbaedb610ee55540608b2f6204e9cc02 100644 (file)
--- 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 e15e3be00b1f2558694d8c1c75a322f79562a839..e74e3e8ffca77adfbd62ae0529e794bfddcc667a 100644 (file)
--- 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 25ef6a993acbd1ed50f3897d0cf86a36cbe4501f..c2738e48b8484a04f51a511f71838b724ca5ef05 100644 (file)
--- 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 aa07321e66fdd9d0d140cb524c260ba9408ae152..2fd74ef164ac06a5a0c2fe07a79f50ef4368e1bf 100644 (file)
--- 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 d61382c0890aa701416ce623aba2441c5e02f180..21237f6c1eee4100334b6104a38d892058369506 100644 (file)
--- 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) {