From 84237dd8285dbbbfb1abda4bbbbdfcba8715812f Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Sun, 19 May 2013 15:57:49 +0300 Subject: [PATCH] E_NOTICE at "yii\console\controllers\AssetController::loadBundleDependency()" has been fixed. --- yii/console/controllers/AssetController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yii/console/controllers/AssetController.php b/yii/console/controllers/AssetController.php index fcf8846..fd75096 100644 --- a/yii/console/controllers/AssetController.php +++ b/yii/console/controllers/AssetController.php @@ -203,9 +203,6 @@ class AssetController extends Controller $assetManager = $this->getAssetManager(); foreach ($bundle->depends as $dependencyName) { if (!array_key_exists($dependencyName, $result)) { - if ($result[$dependencyName] === false) { - throw new Exception("A circular dependency is detected for target '{$dependencyName}'."); - } $dependencyBundle = $assetManager->getBundle($dependencyName); if ($dependencyBundle === null) { throw new Exception("Unable to load dependency bundle '{$dependencyName}' for bundle '{$name}'."); @@ -214,6 +211,10 @@ class AssetController extends Controller $this->loadBundleDependency($dependencyName, $dependencyBundle, $result); $result[$dependencyName] = $dependencyBundle; } + } else { + if ($result[$dependencyName] === false) { + throw new Exception("A circular dependency is detected for target '{$dependencyName}'."); + } } } }