fix conflicts.

2012-04-10 10:10:31 -05:00
parent 8a687053a8 bcca8be072
commit 1a5d4250d1
9 changed files with 30 additions and 14 deletions
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@@ -472,7 +472,7 @@ abstract class Model {
 	 */
 	public function table()
 	{
-		return static::$table ?: strtolower(Str::plural(basename(get_class($this))));
+		return static::$table ?: strtolower(Str::plural(class_basename($this)));
 	}

 	/**