X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Asset.php;h=92e43cbba844120cd4a1481d8489fcd7caa342bf;hp=8a57671e4d98339095cdc7017512b020d020c69c;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=2743eccc8b526ed58067445fe19a281486c2b066

diff --git a/Asset.php b/Asset.php
index 8a57671e..92e43cbb 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)) {
@@ -176,10 +173,11 @@ class Pman_Core_Asset extends Pman {
         }
         
         require_once 'System.php';
+        $ff = HTML_FlexyFramework::get();
         
         $mods = $this->modulesList();
-        $mods[] = $ff->project;
-        $mods[] = $ff->project;
+        $mods[] = $ff->project; // Pman - this was the old format...
+        $mods[] = ''; // Pman + appshortname..
         
         foreach ($mods as $module) {
             $compile_dir = $this->getCompileDir('js', $module, false);