Commit 1a5d4250 authored by Taylor Otwell's avatar Taylor Otwell

fix conflicts.

parents 8a687053 bcca8be0
......@@ -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
*/
......
......@@ -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
......
......@@ -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;
......
......@@ -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)));
}
/**
......
......@@ -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
*/
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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
*/
......
......@@ -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
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment