From f313ec427802d7137680313bd3cf80c92facfeb9 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 18 Jan 2016 14:05:28 +0800 Subject: [PATCH] AssetTrait.php --- AssetTrait.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AssetTrait.php b/AssetTrait.php index 176361f3..9c492a18 100644 --- a/AssetTrait.php +++ b/AssetTrait.php @@ -240,7 +240,7 @@ trait Pman_Core_AssetTrait { $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.css'; - + $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/'; // where are we going to write all of this.. // This has to be done via a @@ -251,7 +251,7 @@ trait Pman_Core_AssetTrait { require_once 'HTML/CSS/Minify.php'; $x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles); - file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.'/Asset/css')); + file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset)); clearstatcache(); if (!file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$routput)) { @@ -264,7 +264,7 @@ trait Pman_Core_AssetTrait { // echo "\n"; } - $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/'; + //$this->arrayToJsInclude( $files); $this->assetArrayToHtml( array( $this->baseURL.$asset. $output, -- 2.39.2