Merge branch 'staging' into develop

2012-03-30 08:45:16 -05:00
parent 3e0d468470 b66d326ec4
commit 369ecd80f7
6 changed files with 30 additions and 6 deletions
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@@ -385,6 +385,19 @@ abstract class Model {
 		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.
 	 *