From bddc9788ef5c572818b19a8bfa369dc464f5482b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 21 Aug 2007 11:47:25 +0100
Subject: new config option: MYSQL_CHARSET

---
 update.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'update.php')

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>";
 	
-- 
cgit v1.2.3-54-g00ecf