Index: branches/version-2_5-dev/php.ini
===================================================================
--- branches/version-2_5-dev/php.ini	(revision 19658)
+++ branches/version-2_5-dev/php.ini	(revision 19658)
@@ -0,0 +1,15 @@
+; 基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
+
+mbstring.language = Japanese
+mbstring.encoding_translation = off
+output_handler = NULL
+magic_quotes_gpc = off
+session.auto_start = 0
+
+; INI_ALL なのにもかかわらず, ini_set で指定しても反映されない環境がある...
+mbstring.internal_encoding = UTF-8
+
+; デフォルトテンプレートの状態で 2M 近くになるため
+upload_max_filesize = 5M
+;post_max_size = 8M
+register_globals = off
Index: branches/version-2_5-dev/html/.htaccess
===================================================================
--- branches/version-2_5-dev/html/.htaccess	(revision 18870)
+++ branches/version-2_5-dev/html/.htaccess	(revision 19658)
@@ -1,13 +1,15 @@
-#基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
+# 基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
+
 php_value mbstring.language Japanese
-php_flag mbstring.encoding_translation 1
-php_flag magic_quotes_gpc 0
-#php_flag session.use_cookies 0
-#php_flag session.use_trans_sid 1
+php_flag mbstring.encoding_translation off
+php_value output_handler NULL
+php_flag magic_quotes_gpc off
+php_flag session.auto_start 0
 
 # INI_ALL なのにもかかわらず, ini_set で指定しても反映されない環境がある...
 php_value mbstring.internal_encoding UTF-8
 
-# デフォルトテンプレートの状態で 2M近くになるため
+# デフォルトテンプレートの状態で 2M 近くになるため
 php_value upload_max_filesize 5M
 #php_value post_max_size 8M
+php_flag register_globals off
Index: branches/version-2_5-dev/html/mobile/.htaccess
===================================================================
--- branches/version-2_5-dev/html/mobile/.htaccess	(revision 17645)
+++ 	(revision )
@@ -1,4 +1,0 @@
-php_flag mbstring.encoding_translation 0
-php_value output_handler null
-php_value variables_order EGPS
-php_flag session.auto_start 0
Index: branches/version-2_5-dev/php.ini-pc
===================================================================
--- branches/version-2_5-dev/php.ini-pc	(revision 18870)
+++ 	(revision )
@@ -1,11 +1,0 @@
-register_globals = Off
-;post_max_size = 8M
-magic_quotes_gpc = Off
-upload_max_filesize = 5M
-
-;session.use_cookies = 0
-;session.use_trans_sid = 1
-
-mbstring.language = Japanese
-mbstring.internal_encoding = UTF-8
-mbstring.encoding_translation = On
Index: branches/version-2_5-dev/php.ini-mobile
===================================================================
--- branches/version-2_5-dev/php.ini-mobile	(revision 18141)
+++ 	(revision )
@@ -1,12 +1,0 @@
-output_handler = NULL
-variables_order = "EGPS"
-register_globals = Off
-;post_max_size = 8M
-magic_quotes_gpc = Off
-upload_max_filesize = 5M
-
-session.auto_start = 0
-
-mbstring.language = Japanese
-mbstring.internal_encoding = UTF-8
-mbstring.encoding_translation = 0ff