Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Taylor Otwell 2012-06-03 17:36:16 -05:00
parent 4dd82a0de3 0bdfea32e7
commit 1ac911f05d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/blade.php
View File

@ -53,7 +53,7 @@ public static function sharpen()
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

2
laravel/database/schema/grammars/sqlserver.php
View File

@ -138,7 +138,7 @@ public function primary(Table $table, Fluent $command)
{
$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})";
}

2
laravel/ioc.php
View File

@ -114,7 +114,7 @@ public static function resolve($type, $parameters = array())
// 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
{