new config option: MYSQL_CHARSET

diff --git a/backend.php b/backend.php
index bbfa8ca233cf3eba48f95101a48540bd1bd8cc3d..4b749f9a9580d4eeec16e28a0ab9180bba8ef01a 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -50,8 +50,10 @@
                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");
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+                       db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        $op = $_REQUEST["op"];

diff --git a/config.php-dist b/config.php-dist
index 5c6d3c1c54c9b47a709de5a9e7ab5b494dcef454..295a30d5b65026ed298a91925916bd94f9b53068 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -146,7 +146,11 @@
        // Enable experimental support for interface translations
        // based on PHP-Gettext. This is of no much use right now.
 
-       define('CONFIG_VERSION', 7);
+       define('MYSQL_CHARSET', '');
+       // Connection charset for MySQL. Only enable if having charset-related
+       // errors with MySQL (mangled characters, errors when updating feeds, etc).
+
+       define('CONFIG_VERSION', 8);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
 

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 33767129e9a7db946af2c15aa64af24cb4714052..4593e9ca75f84b04c09a212ab64ea973fa0ccc49 100644 (file)
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 50a23b2fec18c562e19093d0df3ebd66a46c3098..0a2b8ebc2d4bc305b0df7fc32b6b60f601d43cc6 100644 (file)
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-21 18:35+0400\n"
+"POT-Creation-Date: 2007-08-21 18:36+0400\n"
 "PO-Revision-Date: 2007-08-21 12:37+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -1112,6 +1112,10 @@ msgstr "La base de données de Tiny Tiny RSS est à jour."
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
+#: update.php:109
+msgid "Please backup your database before proceeding."
+msgstr ""
+
 #: update.php:111
 #, php-format
 msgid ""

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 34ba903dec8c522245b6aa28f5ae062d97329aa2..ad4d44d23e66cacd52694cb1f4f81c56f441a4e9 100644 (file)
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index c071ac468d5ef9ba23d6397d8701ce78f9e0cf69..037b2086f6b4ae00cc765eec82edd027930a96b3 100644 (file)
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-21 18:35+0400\n"
+"POT-Creation-Date: 2007-08-21 18:36+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -1051,6 +1051,11 @@ msgstr ""
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
+#: update.php:109
+#, fuzzy
+msgid "Please backup your database before proceeding."
+msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
+
 #: update.php:111
 #, php-format
 msgid ""
@@ -1723,9 +1728,6 @@ msgstr "Сбросить пароль"
 #~ msgid "Label search results"
 #~ msgstr "Результаты поиска"
 
-#~ msgid "<b>Warning:</b> Please backup your database before proceeding."
-#~ msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
-
 #~ msgid "Help"
 #~ msgstr "Помощь"
 

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index deb8c8c1b2600f6ced5254ffee2322da72cb3eb1..9eba09f77314b31d54f22841ad9cd438f869874f 100644 (file)
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 3da01b695961bf9f166ba90dd89162908cabb210..f2573766dd816dfb55b7d90df8e0528794b6e95a 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-21 18:35+0400\n"
+"POT-Creation-Date: 2007-08-21 18:36+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -1058,6 +1058,10 @@ msgstr "Tiny Tiny RSS 数据库是最新版。"
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
+#: update.php:109
+msgid "Please backup your database before proceeding."
+msgstr ""
+
 #: update.php:111
 #, php-format
 msgid ""

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);

diff --git a/sanity_check.php b/sanity_check.php
index b1c145d2be3024d651daff719289f79eed1d890d..7d41ea73aee2307a9d13c87fe661daa0ff19dc33 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,7 +1,7 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 7);
+       define('EXPECTED_CONFIG_VERSION', 8);
        define('SCHEMA_VERSION', 20);
 
        if (!file_exists("config.php")) {

diff --git a/update.php b/update.php
index e74e3e8ffca77adfbd62ae0529e794bfddcc667a..f05fefcce90a8ba51b464eb67d24e156ab11b12a 100644 (file)
--- a/update.php
+++ b/update.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);
@@ -106,7 +108,7 @@ function confirmOP() {
        }
        
        if (!$op) {
-               print_warning("Please backup your database before proceeding.");
+               print_warning(__("Please backup your database before proceeding."));
        
                print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>";
        

diff --git a/update_daemon.php b/update_daemon.php
index c2738e48b8484a04f51a511f71838b724ca5ef05..e7f1f4016e6f7f90cd5f5346295b76e4bdfdc99f 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -66,8 +66,10 @@
                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");
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+                       db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        $last_purge = 0;

diff --git a/update_feeds.php b/update_feeds.php
index 2fd74ef164ac06a5a0c2fe07a79f50ef4368e1bf..9a1b8f43ddfd38480c9bbdd87ea0cf61a0ccf487 100644 (file)
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -27,8 +27,10 @@
                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");
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+                       db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        $result = db_query($link, "SELECT id FROM ttrss_users");

diff --git a/xml-rpc.php b/xml-rpc.php
index 21237f6c1eee4100334b6104a38d892058369506..affb09d0ef64f0b3cf6857471abc395a97a73d1c 100644 (file)
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -23,8 +23,10 @@
                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");
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+                       db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
 
        function getVirtualFeeds($msg) {