diff --git a/laravel/config/container.php b/laravel/config/container.php index 8d43ee0b..c8152e94 100644 --- a/laravel/config/container.php +++ b/laravel/config/container.php @@ -108,7 +108,7 @@ return array( ($request->spoofed()) ? $input = $_POST : parse_str(file_get_contents('php://input'), $input); } - unset($input['_REQUEST_METHOD_']); + unset($input['_REQUEST_METHOD']); return new Input($container->resolve('laravel.file'), $container->resolve('laravel.cookie'), $input, $_FILES); }), diff --git a/laravel/database/connection.php b/laravel/database/connection.php index de9681bb..74311054 100644 --- a/laravel/database/connection.php +++ b/laravel/database/connection.php @@ -13,7 +13,14 @@ class Connection { protected $config; /** - * The PDO connection. + * The query grammar instance for the connection. + * + * @var Grammars\Grammar + */ + protected $grammar; + + /** + * The raw PDO connection instance. * * @var PDO */ @@ -127,13 +134,15 @@ class Connection { */ protected function grammar() { + if (isset($this->grammar)) return $this->grammar; + switch (isset($this->config['grammar']) ? $this->config['grammar'] : $this->driver()) { case 'mysql': - return new Grammars\MySQL; + return $this->grammar = new Grammars\MySQL; default: - return new Grammars\Grammar; + return $this->grammar = new Grammars\Grammar; } }