ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2012-06-21 11:38:50 -05:00
parent 1b062499dd 6e28d0bf2c
commit 7af0304fe8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/connection.php
View File

@@ -194,7 +194,7 @@ class Connection {
return $statement->rowCount(); return $statement->rowCount();
} }
// For insert statements that use the "returning" clause, which is allowed // 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. // real query result so the consumer can get the ID.
elseif (stripos($sql, 'insert') === 0 and stripos($sql, 'returning') !== false) elseif (stripos($sql, 'insert') === 0 and stripos($sql, 'returning') !== false)
{ {

2
laravel/documentation/auth/usage.md
View File

@@ -63,7 +63,7 @@ It is common to limit access to certain routes only to logged in users. In Larav
To protect a route, simply attach the **auth** filter: 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**. > **Note:** You are free to edit the **auth** filter however you like. A default implementation is located in **application/routes.php**.

2
laravel/session.php
View File

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