Merge remote-tracking branch 'upstream/develop' into develop

2012-06-25 13:11:54 -04:00
parent 17e75a9719 4d7d67dd82
commit f3d756476b
23 changed files with 320 additions and 21 deletions
--- a/laravel/blade.php
+++ b/laravel/blade.php
@@ -278,7 +278,7 @@ class Blade {
 	 */
 	protected static function compile_structure_closings($value)
 	{
-		$pattern = '/(\s*)@(endif|endforeach|endfor|endwhile)(\s*)/';
+		$pattern = '/(\s*)@(endif|endforeach|endfor|endwhile|break)(\s*)/';

 		return preg_replace($pattern, '$1<?php $2; ?>$3', $value);
 	}