Browse Source

Merge branch 'master' of github.com:laravel/laravel into develop

Taylor Otwell 12 years ago
parent
commit
1ac911f05d
3 changed files with 3 additions and 3 deletions
  1. 1 1
      laravel/blade.php
  2. 1 1
      laravel/database/schema/grammars/sqlserver.php
  3. 1 1
      laravel/ioc.php

+ 1 - 1
laravel/blade.php

@@ -53,7 +53,7 @@ class Blade {
 				return;
 				return;
 			}
 			}
 
 
-			$compiled = path('storage').'views/'.md5($view->path);
+			$compiled = Blade::compiled($view->path);
 
 
 			// If the view doesn't exist or has been modified since the last time it
 			// If the view doesn't exist or has been modified since the last time it
 			// was compiled, we will recompile the view into pure PHP from it's
 			// was compiled, we will recompile the view into pure PHP from it's

+ 1 - 1
laravel/database/schema/grammars/sqlserver.php

@@ -138,7 +138,7 @@ class SQLServer extends Grammar {
 	{
 	{
 		$name = $command->name;
 		$name = $command->name;
 
 
-		$columns = $this->columnize($command->$columns);
+		$columns = $this->columnize($command->columns);
 
 
 		return 'ALTER TABLE '.$this->wrap($table)." ADD CONSTRAINT {$name} PRIMARY KEY ({$columns})";
 		return 'ALTER TABLE '.$this->wrap($table)." ADD CONSTRAINT {$name} PRIMARY KEY ({$columns})";
 	}
 	}

+ 1 - 1
laravel/ioc.php

@@ -114,7 +114,7 @@ class IoC {
 		// its nested dependencies recursively until they are each resolved.
 		// its nested dependencies recursively until they are each resolved.
 		if ($concrete == $type or $concrete instanceof Closure)
 		if ($concrete == $type or $concrete instanceof Closure)
 		{
 		{
-			$object = static::build($concrete);
+			$object = static::build($concrete, $parameters);
 		}
 		}
 		else
 		else
 		{
 		{