Merge branch 'master' into staging

This commit is contained in:
Taylor Otwell 2012-03-29 14:21:43 -05:00
commit 487c9314c2
1 changed files with 14 additions and 1 deletions

View File

@ -86,6 +86,7 @@ ### Add alias for Eloquent in your application configuration.
Add the following to the **aliases** array in your **application/config/application.php** file: Add the following to the **aliases** array in your **application/config/application.php** file:
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
'Blade' => 'Laravel\\Blade',
### Update Eloquent many-to-many tables. ### Update Eloquent many-to-many tables.
@ -102,3 +103,15 @@ ### Update your **config/strings.php** file.
### Add the **fetch** option to your database configuration file. ### Add the **fetch** option to your database configuration file.
A new **fetch** option allows you to specify in which format you receive your database results. Just copy and paste the option from the new **application/config/database.php** file. A new **fetch** option allows you to specify in which format you receive your database results. Just copy and paste the option from the new **application/config/database.php** file.
### Add **database** option to your Redis configuration.
If you are using Redis, add the "database" option to your Redis connection configurations. The "database" value can be zero by default.
'redis' => array(
'default' => array(
'host' => '127.0.0.1',
'port' => 6379,
'database' => 0
),
),