|
|
@ -371,8 +371,10 @@ class YiiBase |
|
|
|
$class = static::import($class, true); |
|
|
|
$class = static::import($class, true); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (isset(self::$objectConfig[ltrim($class, '\\')])) { |
|
|
|
$class = ltrim($class, '\\'); |
|
|
|
$config = array_merge(self::$objectConfig[ltrim($class, '\\')], $config); |
|
|
|
|
|
|
|
|
|
|
|
if (isset(self::$objectConfig[$class])) { |
|
|
|
|
|
|
|
$config = array_merge(self::$objectConfig[$class], $config); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (($n = func_num_args()) > 1) { |
|
|
|
if (($n = func_num_args()) > 1) { |
|
|
|