From 02581c59e746634cdb45f4bffca663af2f73c5ac Mon Sep 17 00:00:00 2001 From: creocoder Date: Wed, 31 Jul 2013 18:56:36 +0400 Subject: [PATCH] Make ActiveRecord::getNamespacedClass() static --- framework/yii/db/ActiveRecord.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php index 3ad5bd3..a047270 100644 --- a/framework/yii/db/ActiveRecord.php +++ b/framework/yii/db/ActiveRecord.php @@ -440,7 +440,7 @@ class ActiveRecord extends Model public function hasOne($class, $link) { return new ActiveRelation(array( - 'modelClass' => $this->getNamespacedClass($class), + 'modelClass' => static::getNamespacedClass($class), 'primaryModel' => $this, 'link' => $link, 'multiple' => false, @@ -478,7 +478,7 @@ class ActiveRecord extends Model public function hasMany($class, $link) { return new ActiveRelation(array( - 'modelClass' => $this->getNamespacedClass($class), + 'modelClass' => static::getNamespacedClass($class), 'primaryModel' => $this, 'link' => $link, 'multiple' => true, @@ -1400,10 +1400,10 @@ class ActiveRecord extends Model * @param string $class the class name to be namespaced * @return string the namespaced class name */ - protected function getNamespacedClass($class) + protected static function getNamespacedClass($class) { if (strpos($class, '\\') === false) { - $reflector = new \ReflectionClass($this); + $reflector = new \ReflectionClass(static::className()); return $reflector->getNamespaceName() . '\\' . $class; } else { return $class;