new config option: MYSQL_CHARSET

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			db_query($link, "SET NAMES " . MYSQL_CHARSET);
+			db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+		}
 	}
 
 	$op = $_REQUEST["op"];

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

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 ""

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 "Помощь"
 

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 ""

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			db_query($link, "SET NAMES " . MYSQL_CHARSET);
+			db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+		}
 	}
 
 	login_sequence($link);

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")) {

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			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>";
 	

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			db_query($link, "SET NAMES " . MYSQL_CHARSET);
+			db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+		}
 	}
 
 	$last_purge = 0;

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			db_query($link, "SET NAMES " . MYSQL_CHARSET);
+			db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+		}
 	}
 
 	$result = db_query($link, "SELECT id FROM ttrss_users");

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");
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-//		db_query($link, "SET CHARACTER SET utf8");
+			db_query($link, "SET NAMES " . MYSQL_CHARSET);
+			db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+		}
 	}
 
 	function getVirtualFeeds($msg) {