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/view.php
+++ b/laravel/view.php
@@ -118,6 +118,11 @@ class View implements ArrayAccess {
 	 */
 	public static function exists($view, $return_path = false)
 	{
+		if (starts_with($view, 'name: ') and array_key_exists($name = substr($view, 6), static::$names))
+		{
+			$view = static::$names[$name];
+		}
+		
 		list($bundle, $view) = Bundle::parse($view);

 		$view = str_replace('.', '/', $view);