Mercurial > epgrec.yaz
diff config.php.sample @ 152:784e3c82926e
mod: yazucchiさんのパッチ取り込み
| author | epgrec@park.mda.or.jp <yoneda@recorder.localnet.mda.or.jp> |
|---|---|
| date | Sun, 28 Mar 2010 22:13:52 +0900 |
| parents | fadae5e39857 |
| children | 190a3c46611d 84220382fea8 |
line wrap: on
line diff
--- a/config.php.sample Sat Mar 27 16:04:54 2010 +0900 +++ b/config.php.sample Sun Mar 28 22:13:52 2010 +0900 @@ -85,24 +85,6 @@ define( "CS1_EPG_CHANNEL", "CS8" ); // CS1 define( "CS2_EPG_CHANNEL", "CS24" ); // CS2 - -// 遺吾帥ｃ潟若settings/gr_channel.php絖 -// -if( file_exists( INSTALL_PATH."/settings/gr_channel.php" ) ) { - unset($GR_CHANNEL_MAP); - 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" ); -} - - // 順BS吾帥ｃ潟 $BS_CHANNEL_MAP = array( "3001.ontvjapan.com" => "101", @@ -225,6 +207,31 @@ */ ); + +// 遺吾帥ｃ潟若settings/gr_channel.php絖 +// +if( file_exists( INSTALL_PATH."/settings/gr_channel.php" ) ) { + unset($GR_CHANNEL_MAP); + 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" ) ) { + include_once( INSTALL_PATH."/settings/config_custom.php" ); +} + + // DB若宴篁ヤ紊眼с define( "RESERVE_TBL", "reserveTbl" ); // 篋膣若