From 826c83c3012aa0b46e26b574b3ac9bee86c6b396 Mon Sep 17 00:00:00 2001 From: Alexander Kochetov Date: Wed, 19 Jun 2013 15:28:47 +0400 Subject: [PATCH] ActiveRecord::getNamespacedClass() correct PHP 5.3 code --- framework/yii/db/ActiveRecord.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php index 6faebbf..fa0e4ae 100644 --- a/framework/yii/db/ActiveRecord.php +++ b/framework/yii/db/ActiveRecord.php @@ -1393,12 +1393,11 @@ class ActiveRecord extends Model protected function getNamespacedClass($class) { if (strpos($class, '\\') === false) { - $primaryClass = get_class($this); - if (($pos = strrpos($primaryClass, '\\')) !== false) { - return substr($primaryClass, 0, $pos + 1) . $class; - } + $reflector = new \ReflectionClass($this); + return $reflector->getNamespaceName() . '\\' . $class; + } else { + return $class; } - return $class; } /**