script IWP

f2284948 · Qiang Xue · c49222f7 · f2284948 · f2284948
Commit f2284948 authored Apr 15, 2013 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

assets.php framework/assets.php +6 -0

AssetManager.php framework/web/AssetManager.php +2 -1

No files found.
--- a/framework/assets.php
+++ b/framework/assets.php
+<?php
+
+return array(
+	'basePath' => __DIR__ . '/web/assets',
+);
\ No newline at end of file
--- a/framework/web/AssetManager.php
+++ b/framework/web/AssetManager.php
@@ -96,10 +96,11 @@ class AssetManager extends Component

 	/**
 	 * @param string $name
+	 * @param boolean $publish
 	 * @return AssetBundle
 	 * @throws InvalidParamException
 	 */
-	public function getBundle($name)
+	public function getBundle($name, $publish = true)
 	{
 		if (!isset($this->bundles[$name])) {
 			$manifest = Yii::getAlias("@{$name}/assets.php", false);