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

Merge pull request #1526 from TheShiftExchange/blade_e 

Automatically apply entities to output using Blade
This commit is contained in:
Taylor Otwell 2013-01-05 11:44:54 -08:00
parent eb5d68f201 8fe6158058
commit 6a69979376
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/blade.php
View File

@ -197,6 +197,8 @@ protected static function compile_comments($value)
*/ */
protected static function compile_echos($value) protected static function compile_echos($value)
{ {
$value = preg_replace('/\{\{\{(.+?)\}\}\}/', '<?php echo HTML::entities($1); ?>', $value);
return preg_replace('/\{\{(.+?)\}\}/', '<?php echo $1; ?>', $value); return preg_replace('/\{\{(.+?)\}\}/', '<?php echo $1; ?>', $value);
} }

4
laravel/tests/cases/blade.test.php
View File

@ -13,9 +13,13 @@ public function testEchosAreConvertedProperly()
{ {
$blade1 = '{{$a}}'; $blade1 = '{{$a}}';
$blade2 = '{{e($a)}}'; $blade2 = '{{e($a)}}';
$blade3 = '{{{$a}}}';
$blade4 = '{{{e($a)}}}';
$this->assertEquals('<?php echo $a; ?>', Blade::compile_string($blade1)); $this->assertEquals('<?php echo $a; ?>', Blade::compile_string($blade1));
$this->assertEquals('<?php echo e($a); ?>', Blade::compile_string($blade2)); $this->assertEquals('<?php echo e($a); ?>', Blade::compile_string($blade2));
$this->assertEquals('<?php echo HTML::entities($a); ?>', Blade::compile_string($blade3));
$this->assertEquals('<?php echo HTML::entities(e($a)); ?>', Blade::compile_string($blade4));
} }
/** /**