diff options
| author | Andrew Dolgov <[email protected]> | 2007-08-21 06:35:24 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2007-08-21 06:35:24 +0100 |
| commit | c1879099e1a7782842d52ad4eed082e2e713ff85 (patch) | |
| tree | 47a7a8b312d86e8f6f3a7a1b7d91ce45731ce995 | |
| parent | 150b4a2ca54e3743181e3bdab812e2e51f53b9c8 (diff) | |
mysql: disable utf8
| -rw-r--r-- | backend.php | 4 | ||||
| -rw-r--r-- | opml.php | 4 | ||||
| -rw-r--r-- | schema/ttrss_schema_mysql.sql | 4 | ||||
| -rw-r--r-- | update.php | 4 | ||||
| -rw-r--r-- | update_daemon.php | 4 | ||||
| -rw-r--r-- | update_feeds.php | 4 | ||||
| -rw-r--r-- | xml-rpc.php | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/backend.php b/backend.php index c5757a2ff..bbfa8ca23 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"]; @@ -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 28e3b4efd..e55038b7f 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 e15e3be00..e74e3e8ff 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 25ef6a993..c2738e48b 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 aa07321e6..2fd74ef16 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 d61382c08..21237f6c1 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) { |