new config option: MYSQL_CHARSET

[tt-rss.git] / opml.php

diff --git a/opml.php b/opml.php
index f5655cb31bd0d4304189bdeb7b29ba2f0db846f7..ce7b490b43cf8b3dfcc24796f978cd867327e0ef 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -14,8 +14,10 @@
                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");
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+                       db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        login_sequence($link);