diff options
| author | Andrew Dolgov <[email protected]> | 2007-08-21 11:47:25 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2007-08-21 11:47:25 +0100 |
| commit | bddc9788ef5c572818b19a8bfa369dc464f5482b (patch) | |
| tree | 67e2996486dd6e1e75d326ced6a1fbf2f0c06edd /update.php | |
| parent | 319f05733b76bf1f0932761e1ac53512f7091bc9 (diff) | |
new config option: MYSQL_CHARSET
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 8 |
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>"; |