From: Alan Knowles <alan@roojs.com>
Date: Thu, 14 Jan 2016 10:12:07 +0000 (+0800)
Subject: AssetTrait.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=717dde805c891b4faa807bf35eebda78c66e4881

AssetTrait.php
---

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 "<!-- file already exists: {$basedir}/{$output} -->\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 "<!-- file already exists: {$basedir}/{$output} -->\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');