diff Reservation.class.php @ 170:1c4558d1a449

merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sun, 18 Apr 2010 22:48:48 +0900
parents 3d4df1fe4166 e379552d084c
children 3474a501f802
line wrap: on
line diff
--- a/Reservation.class.php	Fri Apr 16 19:08:58 2010 +0900
+++ b/Reservation.class.php	Sun Apr 18 22:48:48 2010 +0900
@@ -238,7 +238,10 @@
 			$filename = mb_str_replace("%DURATION%","".$duration, $filename );
 			
 			// あると面倒くさそうな文字を全部_に
-			$filename = preg_replace("/[ \.\/\*:<>\?\\|()\'\"&]/u","_", trim($filename) );
+//			$filename = preg_replace("/[ \.\/\*:<>\?\\|()\'\"&]/u","_", trim($filename) );
+			
+			// preg_replaceがUTF-8に対応できない環境があるようなのでmb_ereg_replaceに戻す
+			$filename = mb_ereg_replace("[ \./\*:<>\?\\|()\'\"&]","_", trim($filename) );
 			
 			// 文字コード変換
 			if( defined("FILESYSTEM_ENCODING") ) {