Mercurial > epgrec.yaz
diff config.php.sample @ 146:4afd353b4507
merged with upstream
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 23 Mar 2010 02:37:31 +0900 |
| parents | 9a27c517df8f 42f6eb738567 |
| children | 8f4f74463d08 |
line wrap: on
line diff
--- a/config.php.sample Sun Mar 21 05:51:19 2010 +0900 +++ b/config.php.sample Tue Mar 23 02:37:31 2010 +0900 @@ -214,6 +214,16 @@ include_once( INSTALL_PATH."/settings/gr_channel.php" ); } +// +// settings/site_conf.phpがあればそれを優先する +// +if( file_exists( INSTALL_PATH."/settings/site_conf.php" ) ) { + unset($GR_CHANNEL_MAP); + unset($RECORD_MODE); + include_once( INSTALL_PATH."/settings/site_conf.php" ); +} + +// Deprecated // カスタマイズした設定をロードし、デフォルト設定をオーバライドする // unsetはカスタム設定ファイルの責任で行う if( file_exists( INSTALL_PATH."/settings/config_custom.php" ) ) {