diff Reservation.class.php @ 146:4afd353b4507

merged with upstream

--- a/Reservation.class.php	Sun Mar 21 05:51:19 2010 +0900
+++ b/Reservation.class.php	Tue Mar 23 02:37:31 2010 +0900
@@ -43,7 +43,8 @@
 		$category_id = 0,		// カテゴリID
 		$program_id = 0,		// 番組ID
 		$autorec = 0,			// 自動録画
-		$mode = 0				// 録画モード
+		$mode = 0,				// 録画モード
+		$dirty = 0				// ダーティフラグ
 	) {
 		global $RECORD_MODE;
 		$settings = Settings::factory();
@@ -130,7 +131,8 @@
 						$prev_endtime      = $trecs[$i]->endtime;
 						$prev_autorec      = $trecs[$i]->autorec;
 						$prev_mode         = $trecs[$i]->mode;
-
+						$prev_dirty        = $trecs[$i]->dirty;
+						
 						$prev_start_time = toTimestamp($prev_starttime);
 						// 始まっていない予約？
 						if( $prev_start_time > (time() + PADDING_TIME + $settings->former_time) ) {
@@ -153,7 +155,8 @@
 									$prev_category_id,			// カテゴリID
 									$prev_program_id,			// 番組ID
 									$prev_autorec,				// 自動録画
-									$prev_mode );
+									$prev_mode,
+									$prev_dirty );
 							}
 							catch( Exception $e ) {
 								throw new Exception( "重複予約を解消できません" );