Merge branch 'master' of github.com:laravel/laravel
This commit is contained in:
commit
bcca8be072
|
@ -116,7 +116,7 @@ protected function resolve($migrations)
|
||||||
// naming collisions with other bundle's migrations.
|
// naming collisions with other bundle's migrations.
|
||||||
$prefix = Bundle::class_prefix($bundle);
|
$prefix = Bundle::class_prefix($bundle);
|
||||||
|
|
||||||
$class = $prefix.substr($name, 18);
|
$class = $prefix.\Laravel\Str::classify(substr($name, 18));
|
||||||
|
|
||||||
$migration = new $class;
|
$migration = new $class;
|
||||||
|
|
||||||
|
|
|
@ -465,7 +465,7 @@ public function dirty()
|
||||||
*/
|
*/
|
||||||
public function table()
|
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;
|
protected $other;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The columns on the joining tbale that should be fetched.
|
* The columns on the joining table that should be fetched.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -692,7 +692,7 @@ protected function message($attribute, $rule)
|
||||||
{
|
{
|
||||||
return $this->messages[$custom];
|
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);
|
return Lang::line($custom)->get($this->language);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue