Commit 1ac911f0 by Taylor Otwell

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

parents 4dd82a0d 0bdfea32
......@@ -53,7 +53,7 @@ class Blade {
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
// was compiled, we will recompile the view into pure PHP from it's
......
......@@ -138,7 +138,7 @@ class SQLServer extends Grammar {
{
$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})";
}
......
......@@ -114,7 +114,7 @@ class IoC {
// its nested dependencies recursively until they are each resolved.
if ($concrete == $type or $concrete instanceof Closure)
{
$object = static::build($concrete);
$object = static::build($concrete, $parameters);
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment