From 717dde805c891b4faa807bf35eebda78c66e4881 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 14 Jan 2016 18:12:07 +0800 Subject: [PATCH] AssetTrait.php --- AssetTrait.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AssetTrait.php b/AssetTrait.php index a35005be..a88483e1 100644 --- a/AssetTrait.php +++ b/AssetTrait.php @@ -111,7 +111,7 @@ trait Pman_Core_AssetTrait { // echo "\n"; } - $asset = $ff->project == 'Pman' ? '/Pman/Asset/js' : '/Asset/js/'; + $asset = $ff->project == 'Pman' ? '/Pman/Asset/js/' : '/Asset/js/'; //$this->arrayToJsInclude( $files); $this->assetArrayToHtml( array( $this->baseURL.$asset. $output, @@ -260,9 +260,11 @@ trait Pman_Core_AssetTrait { } else { // echo "\n"; } + + $asset = $ff->project == 'Pman' ? '/Pman/Asset/css/' : '/Asset/css/'; //$this->arrayToJsInclude( $files); $this->assetArrayToHtml( array( - $this->baseURL.'/Asset/css/'. $output, + $this->baseURL.$asset. $output, ),'css'); -- 2.39.2