Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:laravel/laravel

This commit is contained in:
Taylor Otwell 2012-04-10 10:09:43 -05:00
parent cb9050844a 2e7cca1d0b
commit bcca8be072
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/cli/tasks/migrate/resolver.php
View File

@ -116,7 +116,7 @@ protected function resolve($migrations)
// 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;

2
laravel/database/eloquent/model.php
View File

@ -465,7 +465,7 @@ public function dirty()
*/
public function table()
{
return static::$table ?: strtolower(Str::plural(basename(get_class($this))));
return static::$table ?: strtolower(Str::plural(class_basename($this)));
}
/**

2
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@ -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
*/

2
laravel/validator.php
View File

@ -692,7 +692,7 @@ protected function message($attribute, $rule)
{
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);
}