Fixed Yii::importNamespaces() bug.

b68bd8ef · Qiang Xue · 8520be08 · b68bd8ef
Commit b68bd8ef authored May 09, 2013 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

YiiBase.php framework/YiiBase.php +2 -2

No files found.
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -158,8 +158,8 @@ class YiiBase
 	{
 		foreach ($namespaces as $name => $path) {
 			if ($name !== '') {
-				$name = '@' . str_replace('\\', '/', $name);
+				$name = trim(strtr($name, array('\\' => '/', '_' => '/')), '/');
-				static::setAlias($name, $path);
+				static::setAlias('@' . $name, rtrim($path, '/\\') . '/' . $name);
 			}
 		}
 	}