diff --git a/laravel/blade.php b/laravel/blade.php index 416848f9..c362d57b 100644 --- a/laravel/blade.php +++ b/laravel/blade.php @@ -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 diff --git a/laravel/database/schema/grammars/sqlserver.php b/laravel/database/schema/grammars/sqlserver.php index 6cc912f7..5f756c2e 100644 --- a/laravel/database/schema/grammars/sqlserver.php +++ b/laravel/database/schema/grammars/sqlserver.php @@ -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})"; } diff --git a/laravel/ioc.php b/laravel/ioc.php index e752635a..512cf863 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -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 {