diff Reservation.class.php @ 87:36ac7c416bd7

merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 01 Mar 2010 20:51:36 +0900
parents 11f63ae04a96 6eabffb0ccac
children e2c37cc736db
line wrap: on
line diff
--- a/Reservation.class.php	Sun Feb 14 17:01:02 2010 +0900
+++ b/Reservation.class.php	Mon Mar 01 20:51:36 2010 +0900
@@ -235,7 +235,7 @@
 //				$filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" );
 				$filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "auto" );
 			}
-			$filename .= $RECORD_MODE[$mode]['suffix'];
+			$filename .= $RECORD_MODE["$mode"]['suffix'];
 			$thumbname = $filename.".jpg";
 
 			// サムネール
@@ -277,6 +277,7 @@
 			              "THUMB"    => INSTALL_PATH.$settings->thumbs."/".$thumbname,
 			              "FORMER"   => "".$settings->former_time,
 			              "FFMPEG"   => "".$settings->ffmpeg,
+			              "SID"      => $crec->sid,
 			);
 
 			// ATで予約する