Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing merge issue for blade comments pull

This commit is contained in:
Dayle Rees 2012-07-31 14:42:23 +01:00
parent 9ea5018372 75033f6287
commit 2611c1f27a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/blade.php
View File

@ -186,9 +186,9 @@ protected static function extract($value, $expression)
*/ */
protected static function compile_comments($value) protected static function compile_comments($value)
{ {
$value = preg_replace('/\{\{--(.+?)(--\}\})?\n/s', "<?php // $1 ?>", $value); $value = preg_replace('/\{\{--(.*?)--\}\}/', "<?php // $1 ?>", $value);
return preg_replace('/\{\{--((.|\s)*?)--\}\}/s', "<?php /* $1 */ ?>\n", $value); return preg_replace('/\{\{--(.*?)--\}\}/s', "<?php /* ?>$1<?php */ ?>", $value);
} }
/** /**

6
laravel/documentation/views/templating.md
View File

@ -132,6 +132,12 @@ #### Blade comments:
{{-- This is a comment --}} {{-- This is a comment --}}
... ...
@endif @endif
{{--
This is
a multi-line
comment.
--}}
> **Note:** Blade comments, unlike HTML comments, are not visible in the HTML source. > **Note:** Blade comments, unlike HTML comments, are not visible in the HTML source.