Skip to content

Commit

Permalink
refs #1431
Browse files Browse the repository at this point in the history
 * 테스트겸 config 파일을 이동함.
  • Loading branch information
inureyes committed Feb 4, 2010
1 parent 19e42bd commit a3e618a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
File renamed without changes.
8 changes: 4 additions & 4 deletions framework/model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ public static function getInstance() {
return self::_getInstance(__CLASS__);
}

protected function __construct() {
$this->__basicConfigLoader();
protected function __construct($id = 'textcube') {
$this->__basicConfigLoader($id);
}

private function __basicConfigLoader() {
private function __basicConfigLoader($id) {
global $database, $service; // For Legacy global variable support
$this->settings = array();
require_once(ROOT.'/library/config.default.php'); // Loading default configuration
require_once(ROOT.'/framework/id/'.$id.'/config.default.php'); // Loading default configuration
if (file_exists(ROOT.'/config.php')) @include(ROOT.'/config.php'); // Override configuration
// Map port setting.
if (@is_numeric($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != 80) && ($_SERVER['SERVER_PORT'] != 443))
Expand Down

0 comments on commit a3e618a

Please sign in to comment.