fixing merge issue for blade comments pull

2012-07-31 14:42:23 +01:00
parent 9ea5018372 75033f6287
commit 2611c1f27a
2 changed files with 9 additions and 3 deletions
--- a/laravel/blade.php
+++ b/laravel/blade.php
@@ -186,9 +186,9 @@ class Blade {
 	 */
 	protected static function compile_comments($value)
 	{
-		$value = preg_replace('/\{\{--(.+?)(--\}\})?\n/s', "<?php // $1 ?>", $value);
-
-		return preg_replace('/\{\{--((.|\s)*?)--\}\}/s', "<?php /* $1 */ ?>\n", $value);
+		$value = preg_replace('/\{\{--(.*?)--\}\}/', "<?php // $1 ?>", $value);
+		
+		return preg_replace('/\{\{--(.*?)--\}\}/s', "<?php /* ?>$1<?php */ ?>", $value);
 	}

 	/**