diff --git a/artisan b/artisan index 68e645ea..6034de07 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/changes.md b/changes.md index a02a9077..351cd89e 100644 --- a/changes.md +++ b/changes.md @@ -4,6 +4,8 @@ ## Contents - [Laravel 3.2](#3.2) - [Upgrading From 3.1](#upgrade-3.2) +- [Laravel 3.1.3](#3.1.3) +- [Upgrading From 3.1.2](#uprade-3.1.3) - [Laravel 3.1.2](#3.1.2) - [Upgrading From 3.1.1](#upgrade-3.1.2) - [Laravel 3.1.1](#3.1.1) @@ -11,6 +13,7 @@ ## Contents - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) +<<<<<<< HEAD ## Laravel 3.2 @@ -26,6 +29,16 @@ ## Upgrading From 3.1 - Replace the **laravel** folder. - Add new **vendors** folder. + +## Laravel 3.1.3 + +- Fixes **delete** method in Eloquent models. + + +## Upgrade From 3.1.2 + +- Replace the **laravel** folder. + ## Laravel 3.1.2 diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php index 0bcda60f..7a3e872c 100644 --- a/laravel/database/eloquent/model.php +++ b/laravel/database/eloquent/model.php @@ -385,6 +385,19 @@ public function save() return $result; } + /** + * Delete the model from the database. + * + * @return int + */ + public function delete() + { + if ($this->exists) + { + return $this->query()->where(static::$key, '=', $this->get_key())->delete(); + } + } + /** * Set the update and creation timestamps on the model. * diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php index 9667c099..3d34d7f8 100644 --- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php +++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php @@ -170,9 +170,7 @@ public function insert($attributes, $joining = array()) */ public function delete() { - $id = $this->base->get_key(); - - return $this->joining_table()->where($this->foreign_key(), '=', $id)->delete(); + return $this->pivot()->delete(); } /** diff --git a/paths.php b/paths.php index 7d9e1906..729a2697 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 42b6a438..9f78eb6e 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */