diff --git a/backend.php b/backend.php index 3783c8226..77323008f 100644 --- a/backend.php +++ b/backend.php @@ -52,7 +52,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } } diff --git a/mysql_convert_unicode.php b/mysql_convert_unicode.php new file mode 100644 index 000000000..dfc833b44 --- /dev/null +++ b/mysql_convert_unicode.php @@ -0,0 +1,112 @@ + + + + +MySQL Charset Converter + + + + + + + + + + + +

+ + + + "; + + } else if (!$op) { + + print_warning(__("Please backup your database before proceeding.")); + + print "

" . __("This script will convert your Tiny Tiny RSS database to UTF-8. + Depending on current database charset you may experience data corruption (lost accent characters, etc.). + After update, you'll have to set MYSQL_CHARSET option in config.php to 'utf8'.") . "

"; + + print "
+ + +
"; + + } else if ($op == "do") { + + print "

".__("Converting database...")."

"; + + db_query($link, "SET FOREIGN_KEY_CHECKS=0"); + + $result = db_query($link, "SHOW TABLES LIKE 'ttrss%'"); + + while ($line = db_fetch_assoc($result)) { + $vals = array_values($line); + $table = $vals[0]; + + $query = "ALTER TABLE $table CONVERT TO + CHARACTER SET 'utf8'"; + + print "

$query

"; + + db_query($link, $query); + } + + db_query($link, "SET FOREIGN_KEY_CHECKS=1"); + + print "
+ +
"; + + } + +?> + + + + diff --git a/opml.php b/opml.php index ce7b490b4..883ddd0d9 100644 --- a/opml.php +++ b/opml.php @@ -16,7 +16,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } } diff --git a/update.php b/update.php index f05fefcce..f59f9ef3e 100644 --- a/update.php +++ b/update.php @@ -16,7 +16,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } } diff --git a/update_daemon.php b/update_daemon.php index e7f1f4016..ce5d2535e 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -68,7 +68,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } } diff --git a/update_feeds.php b/update_feeds.php index 9a1b8f43d..a6956dfa8 100644 --- a/update_feeds.php +++ b/update_feeds.php @@ -29,7 +29,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } } diff --git a/xml-rpc.php b/xml-rpc.php index affb09d0e..07f423cbd 100644 --- a/xml-rpc.php +++ b/xml-rpc.php @@ -25,7 +25,7 @@ } else { if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { db_query($link, "SET NAMES " . MYSQL_CHARSET); - db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); +// db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); } }