X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Asset.php;h=eb5c0538de30ffc395121bf6ff6c9b9fe56b6250;hb=d3fc56bf4a2e451d3b4d847adc5fa0fa04e8f563;hp=5c1ecc9f69a1124e9ce4ab04000b982dfd1f9871;hpb=799f8287375fbaa03063246b5e6a96a3255da200;p=Pman.Core

diff --git a/Asset.php b/Asset.php
index 5c1ecc9f..eb5c0538 100644
--- a/Asset.php
+++ b/Asset.php
@@ -36,8 +36,6 @@ class Pman_Core_Asset extends Pman {
     
     function get($s='', $opts = Array())
     {
-
-        
         $this->sessionState(0);
         
         $bits = explode('/', $s);
@@ -51,9 +49,8 @@ class Pman_Core_Asset extends Pman {
         $ui = posix_getpwuid(posix_geteuid());
         $ff = HTML_FlexyFramework::get();
         
-        $compile = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-' . $ff->version .  '-'. $bits[0] . 'compile';
-     
+        $compile = self::getCompileDir($bits[0], '', false);
+        
         $fn = $compile . '/'. $s .'.'. $bits[0];
         
         if (!file_exists($fn)) {
@@ -141,6 +138,7 @@ class Pman_Core_Asset extends Pman {
         switch($type) {
             case 'js':
             case 'css':
+            case 'scss':
                 $compile_dir .= implode("-", array(
                     $ui['name'],
                     $module,
@@ -176,9 +174,10 @@ class Pman_Core_Asset extends Pman {
         }
         
         require_once 'System.php';
+        $ff = HTML_FlexyFramework::get();
         
         $mods = $this->modulesList();
-        $mods[] = $ff->project; // Pman
+        $mods[] = $ff->project; // Pman - this was the old format...
         $mods[] = ''; // Pman + appshortname..
         
         foreach ($mods as $module) {