ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/blade.php
View File

@@ -149,9 +149,9 @@ class Blade {
return $value;
}
// First we'll get the layout from the top of the template and remove it.
// Then it is replaced with @include and attached to the end.
// By convention it must be located on the first line of the template contents.
// First we'll split out the lines of the template so we can get the
// layout from the top of the template. By convention, it must be
// located on the first line of the template contents.
preg_replace_callback(
'/^@layout(\s*?\(.+?\))(\r?\n)?/',
function($matches) use (&$value)
@@ -211,7 +211,7 @@ class Blade {
protected static function compile_forelse($value)
{
preg_match_all('/@forelse\s*?\(\s*?\$(.+?)\s*?as\s*?\$(.+?)\s*?\)/', $value, $matches, PREG_SET_ORDER );
if ( count($matches) < 1 ) return $value;
foreach ($matches as $forelse)
@@ -452,7 +452,7 @@ class Blade {
}
return $value;
}
}
/**
* Get the regular expression for a generic Blade function.