From 49514f00cd0d3500ccbd1de9d3cb30807eb4a867 Mon Sep 17 00:00:00 2001
From: mumin <mumincacao@users.sourceforge.jp>
Date: Thu, 23 Jul 2009 23:33:47 +0900
Subject: [PATCH] #17928 - Cannot load update config file.

---
 documents/changes.en.txt                           |  1 +
 documents/changes.ja.txt                           |  1 +
 .../modules/sd3rd/class/updater/config.inc.php     | 29 +++++++++-------------
 trust_path/modules/sd3rd/update.php                |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/documents/changes.en.txt b/documents/changes.en.txt
index bf3ea83..ac7f43d 100644
--- a/documents/changes.en.txt
+++ b/documents/changes.en.txt
@@ -1,3 +1,4 @@
+#17928 - Cannot load update config file.
 #17927 - Sd3rd_UpdateUtils::convertTableNmae is not defined.
 #17915 - Variable $e is not defined in Sd3rdUpdater::execute().
 #17914 - Process start message was not setup yet.
diff --git a/documents/changes.ja.txt b/documents/changes.ja.txt
index e46cb8d..7cf65a8 100644
--- a/documents/changes.ja.txt
+++ b/documents/changes.ja.txt
@@ -1,3 +1,4 @@
+#17928 - ‚ ‚Á‚ՂŁ[‚½—p‚̐ݒè‚Ó‚Ÿ‚¢‚é‚ð‚¿‚á‚ñ‚Ɠǂݍž‚ß‚Ä‚È‚©‚Á‚½‚̂ŏC³
 #17927 - Sd3rd_UpdateUtils::convertTableNmae ‚Í Nmae ‚¶‚á‚È‚­‚Á‚Ä Name ‚¾‚Á‚½‚̂ŏC³
 #17915 - Sd3rdUpdater::execute() ‚Å $e ‚͐錾‚³‚ê‚Ä‚È‚©‚Á‚½‚̂ŏC³
 #17914 - ‚Ղ낹‚·ŠJŽn‚ß‚Á‚¹‚ð’è‹`‘O‚ÉŽg‚¨‚¤‚Æ‚µ‚Ä‚½‚̂ŏC³
diff --git a/trust_path/modules/sd3rd/class/updater/config.inc.php b/trust_path/modules/sd3rd/class/updater/config.inc.php
index a87eabf..bb78b54 100644
--- a/trust_path/modules/sd3rd/class/updater/config.inc.php
+++ b/trust_path/modules/sd3rd/class/updater/config.inc.php
@@ -1,26 +1,21 @@
-<?php
-/**
 [Sd3rd]
-publicName='sd3rd'
-extractionPattern='/(?P<name>[a-zA-Z]+)(?P<id>\d*)\.(html?|dat)$/'
+publicName="sd3rd"
+extractionPattern="/(?P<name>[a-zA-Z]+)(?P<id>\d*)\.(html?|dat)$/"
 
 [Sd3rd.Encoding]
-input='SJIS'
-output='SJIS'
-database='UTF-8'
+input="SJIS"
+output="SJIS"
+database="UTF8"
 
 [Sd3rd.Progress]
 spanNormal=100
 spanSpecial=1000
-markNormal='*'
-markSpecial='+'
+markNormal="*"
+markSpecial="+"
 
 [Sd3rd.Progress.message]
-start='Process started...'
-prepare='Execute prepare process...'
-execute='Execute main process...'
-dispose='Execute dispose process...'
-finish='Process completed.'
-
-**/
-?>
+start="Process started..."
+prepare="Execute prepare process..."
+execute="Execute main process..."
+dispose="Execute dispose process..."
+finish="Process completed."
diff --git a/trust_path/modules/sd3rd/update.php b/trust_path/modules/sd3rd/update.php
index 53ef6f2..5d1f6b8 100644
--- a/trust_path/modules/sd3rd/update.php
+++ b/trust_path/modules/sd3rd/update.php
@@ -20,7 +20,7 @@ require_once dirname(dirname(dirname(SD3RD_TRUST_PATH))) . '/public_html/mainfil
 
 $_SERVER['REQUEST_METHOD'] = null;
 $root =& XCube_Root::getSingleton();
-$root->overrideSiteConfig(SD3RD_TRUST_PATH . '/class/updater/config.inc.php');
+$root->overrideSiteConfig(parse_ini_file(SD3RD_TRUST_PATH . '/class/updater/config.inc.php',true));
 $controller =& $root->mController;
 $controller->executeCommonSubset();
 $controller->_setupLanguage();  /// @todo Ignore access level violation?
-- 
2.11.0