[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9077:895c585489ec
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/895c585489ec
user: dengen
date: Mon May 20 23:43:36 2013 +0900
description:
Merged with upstream

diffstat:

 public_html/lib-common.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 60a4208f279d -r 895c585489ec public_html/lib-common.php
--- a/public_html/lib-common.php	Mon May 20 16:40:33 2013 +0200
+++ b/public_html/lib-common.php	Mon May 20 23:43:36 2013 +0900
@@ -8537,7 +8537,7 @@
 
 	static $encoding = null;
 
-    $valid_charsets = array('iso-8859-1','iso-8859-15','utf-8','cp866','cp1251','cp1252','koi8-r','big5','gb2312','big5-hkscs','shift_jis sjis','euc-jp');
+    $valid_charsets = array('iso-8859-1','iso-8859-15','utf-8','cp866','cp1251','cp1252','koi8-r','big5','gb2312','big5-hkscs','shift_jis','sjis','euc-jp');
 
 	if ($encoding === null) {
 		if (isset($LANG_CHARSET)) {