Browse Source

Unknown property "yii\console\controllers\AssetController::publishOptions" error has been fixed.

tags/2.0.0-alpha
Klimov Paul 12 years ago
parent
commit
f9b06e1e6d
  1. 4
      tests/unit/framework/console/controllers/AssetControllerTest.php
  2. 2
      yii/console/controllers/AssetController.php

4
tests/unit/framework/console/controllers/AssetControllerTest.php

@ -125,9 +125,9 @@ class AssetControllerTest extends TestCase
'js' => array( 'js' => array(
'js/test.js', 'js/test.js',
), ),
'depends' => array( /*'depends' => array(
'yii', 'yii',
), ),*/
), ),
); );
return $bundles; return $bundles;

2
yii/console/controllers/AssetController.php

@ -41,7 +41,7 @@ class AssetController extends Controller
$this->loadConfiguration($configFile); $this->loadConfiguration($configFile);
$bundles = $this->loadBundles($this->bundles, $this->extensions); $bundles = $this->loadBundles($this->bundles, $this->extensions);
$targets = $this->loadTargets($this->targets, $bundles); $targets = $this->loadTargets($this->targets, $bundles);
$this->publishBundles($bundles, $this->publishOptions); $this->publishBundles($bundles, $this->assetManager);
$timestamp = time(); $timestamp = time();
foreach ($targets as $target) { foreach ($targets as $target) {
if (!empty($target->js)) { if (!empty($target->js)) {

Loading…
Cancel
Save