Browse Source

E_NOTICE at "yii\console\controllers\AssetController::loadBundleDependency()" has been fixed.

tags/2.0.0-beta
Klimov Paul 12 years ago
parent
commit
84237dd828
  1. 7
      yii/console/controllers/AssetController.php

7
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}'.");
}
}
}
}

Loading…
Cancel
Save