diff storeProgram.inc.php @ 170:1c4558d1a449

merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sun, 18 Apr 2010 22:48:48 +0900
parents e379552d084c
children
line wrap: on
line diff
--- a/storeProgram.inc.php	Fri Apr 16 19:08:58 2010 +0900
+++ b/storeProgram.inc.php	Sun Apr 18 22:48:48 2010 +0900
@@ -191,7 +191,8 @@
 				
 				try {
 					$reserve = new DBRecord( RESERVE_TBL, "program_id", $rec->id );
-					if( $reserve->dirty == 0 ) {
+					// dirtyが立っておらず現在より後の録画予約であるなら
+					if( ($reserve->dirty == 0) && (toTimestamp($reserve->starttime) > time()) ) {
 						$reserve->title = $title;
 						$reserve->description = $desc;
 						reclog( "getepg:: 予約ID".$reserve->id."のEPG情報が更新された" );