Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 19875)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 19937)
@@ -222,5 +222,5 @@
     }
     
-    //管理機能ディレクトリのリネームとinstall.phpの変更
+    //管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
     function lfUpdateAdminData($array){
         $admin_dir = trim($array['admin_dir'])."/";
@@ -240,12 +240,12 @@
         $admin_allow_hosts = serialize($admin_allow_hosts);
 
-        //権限チェック 
-        if(!is_writable(DATA_REALDIR . "install.php")){
-            $this->arrErr["admin_force_ssl"] = DATA_REALDIR . "install.phpを変更する権限がありません。";
+        // 権限チェック 
+        if(!is_writable(CONFIG_REALFILE)){
+            $this->arrErr["admin_force_ssl"] = CONFIG_REALFILE . ' を変更する権限がありません。';
             return false;
         }
 
-        //install.phpの書き換え
-        $installData = file(DATA_REALDIR."install.php",FILE_IGNORE_NEW_LINES);
+        // CONFIG_REALFILE の書き換え
+        $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
         $diff = 0;
         foreach($installData as $key=>$line){
Index: /branches/version-2_5-dev/data/class/SC_Initial.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Initial.php	(revision 19869)
+++ /branches/version-2_5-dev/data/class/SC_Initial.php	(revision 19937)
@@ -71,5 +71,8 @@
     function requireInitialConfig() {
 
-        require_once(realpath(dirname( __FILE__)) ."/../install.php");
+        define('CONFIG_REALFILE', realpath(dirname(__FILE__)) . '/../config/config.php');
+        if (file_exists(CONFIG_REALFILE)) {
+            require_once(CONFIG_REALFILE);
+        }
 
         if (defined('ECCUBE_INSTALL')) {
@@ -132,11 +135,12 @@
      */
     function phpconfigInit() {
-        ini_set("mbstring.http_input", CHAR_CODE);
-        ini_set("mbstring.http_output", CHAR_CODE);
-        ini_set("auto_detect_line_endings", 1);
-        ini_set("default_charset", CHAR_CODE);
-        ini_set("mbstring.internal_encoding", CHAR_CODE);
-        ini_set("mbstring.detect_order", "auto");
-        ini_set("mbstring.substitute_character", "none");
+        ini_set('display_errors', '1');
+        ini_set('mbstring.http_input', CHAR_CODE);
+        ini_set('mbstring.http_output', CHAR_CODE);
+        ini_set('auto_detect_line_endings', 1);
+        ini_set('default_charset', CHAR_CODE);
+        ini_set('mbstring.internal_encoding', CHAR_CODE);
+        ini_set('mbstring.detect_order', 'auto');
+        ini_set('mbstring.substitute_character', 'none');
 
         mb_language('ja'); // mb_internal_encoding() より前に
@@ -145,8 +149,8 @@
 
         mb_internal_encoding(CHAR_CODE); // mb_language() より後で
-        // TODO 上の「ini_set("mbstring.internal_encoding", CHAR_CODE);」を削除できないか検討
+        // TODO 上の「ini_set('mbstring.internal_encoding', CHAR_CODE);」を削除できないか検討
         // TODO .htaccess の mbstring.internal_encoding を削除できないか検討
 
-        ini_set("arg_separator.output","&");
+        ini_set('arg_separator.output', '&');
         
         //ロケールを明示的に設定
Index: /branches/version-2_5-dev/setup.sh
===================================================================
--- /branches/version-2_5-dev/setup.sh	(revision 19762)
+++ /branches/version-2_5-dev/setup.sh	(revision 19937)
@@ -19,5 +19,4 @@
 
 echo "set permissions..."
-chmod a+w $WRK_DIR/data/install.php
 chmod -R a+w $WRK_DIR/html/install/temp
 chmod -R a+w $WRK_DIR/html/user_data
@@ -29,4 +28,5 @@
 chmod -R a+w $WRK_DIR/data/logs
 chmod -R a+w $WRK_DIR/data/upload
+chmod -R a+w $WRK_DIR/data/config
 
 echo "finished."
Index: /branches/version-2_5-dev/html/install/index.php
===================================================================
--- /branches/version-2_5-dev/html/install/index.php	(revision 19931)
+++ /branches/version-2_5-dev/html/install/index.php	(revision 19937)
@@ -399,5 +399,4 @@
     // プログラムで書込みされるファイル・ディレクトリ
     $arrWriteFile = array(
-        DATA_REALDIR . "install.php",
         USER_REALDIR,
         HTML_REALDIR . "upload",
@@ -408,5 +407,5 @@
         DATA_REALDIR . "downloads/",
         DATA_REALDIR . "upload/",
-        HTML_REALDIR . ADMIN_DIR
+        HTML_REALDIR . ADMIN_DIR,
     );
 
@@ -926,6 +925,4 @@
     $url_dir = ereg_replace("^https?://[a-zA-Z0-9_:~=&\?\.\-]+", "", $normal_url);
 
-    $filepath = DATA_REALDIR . "install.php";
-    
     //管理機能SSL制限
     if($objWebParam->getValue('admin_force_ssl') == 1 and strpos($secure_url,"https://") !== FALSE){
@@ -968,5 +965,5 @@
     "?>";
 
-    if($fp = fopen($filepath,"w")) {
+    if ($fp = fopen(CONFIG_REALFILE, 'w')) {
         fwrite($fp, $config_data);
         fclose($fp);
