Commit 30204e08 authored by Taylor Otwell's avatar Taylor Otwell

Fixing bugs in eloquent relating to namespaces.

parent 8457238a
......@@ -62,7 +62,7 @@ abstract class Relationship extends Query {
// namespace, and we'll append "_id" to the name.
if (is_object($model))
{
$model = get_class($model);
$model = class_basename($model);
}
return strtolower(basename($model).'_id');
......@@ -88,7 +88,7 @@ abstract class Relationship extends Query {
*/
protected function foreign_key()
{
return Relationship::foreign($this->base, $this->foreign);
return static::foreign($this->base, $this->foreign);
}
}
\ No newline at end of file
......@@ -388,7 +388,7 @@ function class_basename($class)
{
if (is_object($class)) $class = get_class($class);
return basename($class);
return basename(str_replace('\\', '/', $class));
}
/**
......
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