Browse Source

Fix View's use of Events so you can actually implement your own things

Signed-off-by: Phill Sparks <me@phills.me.uk>
Phill Sparks 12 years ago
parent
commit
0baf5ad9b1
3 changed files with 5 additions and 5 deletions
  1. 1 1
      laravel/blade.php
  2. 1 1
      laravel/event.php
  3. 3 3
      laravel/view.php

+ 1 - 1
laravel/blade.php

@@ -42,7 +42,7 @@ class Blade {
 			// return false so the View can be rendered as normal.
 			// return false so the View can be rendered as normal.
 			if ( ! str_contains($view->path, BLADE_EXT))
 			if ( ! str_contains($view->path, BLADE_EXT))
 			{
 			{
-				return false;
+				return;
 			}
 			}
 
 
 			$compiled = path('storage').'views/'.md5($view->path);
 			$compiled = path('storage').'views/'.md5($view->path);

+ 1 - 1
laravel/event.php

@@ -151,7 +151,7 @@ class Event {
 			}
 			}
 		}
 		}
 
 
-		return $responses;
+		return $halt ? null : $responses;
 	}
 	}
 
 
 }
 }

+ 3 - 3
laravel/view.php

@@ -125,7 +125,7 @@ class View implements ArrayAccess {
 		// We delegate the determination of view paths to the view loader event
 		// We delegate the determination of view paths to the view loader event
 		// so that the developer is free to override and manage the loading
 		// so that the developer is free to override and manage the loading
 		// of views in any way they see fit for their application.
 		// of views in any way they see fit for their application.
-		$path = Event::first(static::loader, array($bundle, $view));
+		$path = Event::until(static::loader, array($bundle, $view));
 
 
 		if ( ! is_null($path))
 		if ( ! is_null($path))
 		{
 		{
@@ -322,9 +322,9 @@ class View implements ArrayAccess {
 		// allows easy attachment of other view parsers.
 		// allows easy attachment of other view parsers.
 		if (Event::listeners(static::engine))
 		if (Event::listeners(static::engine))
 		{
 		{
-			$result = Event::first(static::engine, array($this));
+			$result = Event::until(static::engine, array($this));
 
 
-			if ($result !== false) return $result;
+			if ( ! is_null($result)) return $result;
 		}
 		}
 
 
 		return $this->get();
 		return $this->get();