# HG changeset patch
# User epgrec@park.mda.or.jp <yoneda@recorder.localnet.mda.or.jp>
# Date 1269176043 -32400
# Node ID 42f6eb7385679c1817758135c81b124259d79e1f
# Parent  481e789605e33d545e672e5eeb193baea13d78c2
mod: ΐΡ€ί»Δ€·€ς½€ΐ΅

diff -r 481e789605e3 -r 42f6eb738567 cancelReservation.php
--- a/cancelReservation.php	Sun Mar 21 16:42:58 2010 +0900
+++ b/cancelReservation.php	Sun Mar 21 21:54:03 2010 +0900
@@ -23,6 +23,7 @@
 				// γƒ•γ‚‘γ‚€γƒ«γ‚’ε‰Šι™€
 				if( file_exists( INSTALL_PATH."/".$settings->spool."/".$rec->path ) ) {
 					@unlink(INSTALL_PATH."/".$settings->spool."/".$rec->path);
+					@unlink(INSTALL_PATH."/".$settings->thumbs."/".$rec->path.".jpg");
 				}
 			}
 		}
diff -r 481e789605e3 -r 42f6eb738567 config.php.sample
--- a/config.php.sample	Sun Mar 21 16:42:58 2010 +0900
+++ b/config.php.sample	Sun Mar 21 21:54:03 2010 +0900
@@ -93,6 +93,15 @@
 	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(