Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2012-06-21 11:38:50 -05:00
commit 7af0304fe8
3 changed files with 3 additions and 3 deletions

View File

@ -194,7 +194,7 @@ public function query($sql, $bindings = array())
return $statement->rowCount();
}
// For insert statements that use the "returning" clause, which is allowed
// by databsae systems such as Postgres, we need to actually return the
// by database systems such as Postgres, we need to actually return the
// real query result so the consumer can get the ID.
elseif (stripos($sql, 'insert') === 0 and stripos($sql, 'returning') !== false)
{

View File

@ -63,7 +63,7 @@ ## Protecting Routes
To protect a route, simply attach the **auth** filter:
Route::get('admin', array('before' => 'auth', function() {});
Route::get('admin', array('before' => 'auth', function() {}));
> **Note:** You are free to edit the **auth** filter however you like. A default implementation is located in **application/routes.php**.

View File

@ -1,4 +1,4 @@
<?php namespace Laravel;
<?php namespace Laravel; use Closure;
class Session {