Merge remote-tracking branch 'upstream/develop' into develop

2012-06-25 13:11:54 -04:00
parent 17e75a9719 4d7d67dd82
commit f3d756476b
23 changed files with 320 additions and 21 deletions
--- a/laravel/database/connection.php
+++ b/laravel/database/connection.php
@@ -194,7 +194,7 @@ class Connection {
 			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)
 		{