fix conflicts.

artisan

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.6
+ * @version  3.1.7
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

laravel/autoloader.php

@@ -61,6 +61,8 @@ class Autoloader {
 		elseif (isset(static::$mappings[$class]))
 		{
 			require static::$mappings[$class];
+
+			return;
 		}
 
 		// If the class namespace is mapped to a directory, we will load the

laravel/cli/tasks/migrate/resolver.php

@@ -116,7 +116,7 @@ class Resolver {
 			// naming collisions with other bundle's migrations.
 			$prefix = Bundle::class_prefix($bundle);
 
-			$class = $prefix.substr($name, 18);
+			$class = $prefix.\Laravel\Str::classify(substr($name, 18));
 
 			$migration = new $class;
 

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)));
 	}
 
 	/**

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -21,7 +21,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 	protected $other;
 
 	/**
-	 * The columns on the joining tbale that should be fetched.
+	 * The columns on the joining table that should be fetched.
 	 *
 	 * @var array
 	 */

laravel/documentation/changes.md

@@ -4,6 +4,8 @@
 
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
+- [Laravel 3.1.7](#3.1.7)
+- [Upgrading From 3.1.6](#upgrade-3.1.7)
 - [Laravel 3.1.6](#3.1.6)
 - [Upgrading From 3.1.5](#upgrade-3.1.6)
 - [Laravel 3.1.5](#3.1.5)
@@ -39,6 +41,18 @@
 
 - Replace the **laravel** folder.
 
+<a name="3.1.7"></a>
+## Laravel 3.1.7
+
+- Fixes custom validation language line loading from bundles.
+- Fixes double-loading of classes when overriding the core.
+- Classify migration names.
+
+<a name="upgrade-3.1.7"></a>
+## Upgrading From 3.1.6
+
+- Replace the **laravel** folder.
+
 <a name="3.1.6"></a>
 ## Laravel 3.1.6
 

laravel/validator.php

@@ -559,7 +559,7 @@ class Validator {
 	protected function validate_active_url($attribute, $value)
 	{
 		$url = str_replace(array('http://', 'https://', 'ftp://'), '', Str::lower($value));
-		
+
 		return checkdnsrr($url);
 	}
 
@@ -608,7 +608,7 @@ class Validator {
 	 */
 	protected function validate_alpha_dash($attribute, $value)
 	{
-		return preg_match('/^([-a-z0-9_-])+$/i', $value);	
+		return preg_match('/^([-a-z0-9_-])+$/i', $value);
 	}
 
 	/**
@@ -657,7 +657,7 @@ class Validator {
 	protected function validate_before($attribute, $value, $parameters)
 	{
 		return (strtotime($value) < strtotime($parameters[0]));
-	}	
+	}
 
 	/**
 	 * Validate the date is after a given date.
@@ -670,7 +670,7 @@ class Validator {
 	protected function validate_after($attribute, $value, $parameters)
 	{
 		return (strtotime($value) > strtotime($parameters[0]));
-	}		
+	}
 
 	/**
 	 * Get the proper error message for an attribute and rule.
@@ -692,7 +692,7 @@ class Validator {
 		{
 			return $this->messages[$custom];
 		}
-		elseif (Lang::has($custom = "validation.custom.{$custom}", $this->language))
+		elseif (Lang::has($custom = "{$bundle}validation.custom.{$custom}", $this->language))
 		{
 			return Lang::line($custom)->get($this->language);
 		}
@@ -753,7 +753,7 @@ class Validator {
 			$line = 'string';
 		}
 
-		return Lang::line("{$bundle}validation.{$rule}.{$line}")->get($this->language);	
+		return Lang::line("{$bundle}validation.{$rule}.{$line}")->get($this->language);
 	}
 
 	/**
@@ -929,7 +929,7 @@ class Validator {
 	protected function replace_after($message, $attribute, $rule, $parameters)
 	{
 		return str_replace(':date', $parameters[0], $message);
-	}	
+	}
 
 	/**
 	 * Get the displayable name for a given attribute.
@@ -988,7 +988,7 @@ class Validator {
 	{
 		$parameters = array();
 
-		// The format for specifying validation rules and parameters follows a 
+		// The format for specifying validation rules and parameters follows a
 		// {rule}:{parameters} formatting convention. For instance, the rule
 		// "max:3" specifies that the value may only be 3 characters long.
 		if (($colon = strpos($rule, ':')) !== false)

paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.6
+ * @version  3.1.7
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.6
+ * @version  3.1.7
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */