summaryrefslogtreecommitdiff
path: root/update.php
diff options
context:
space:
mode:
Diffstat (limited to 'update.php')
-rw-r--r--update.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/update.php b/update.php
index e74e3e8ff..f05fefcce 100644
--- 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>";