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

diff --git a/Asset.php b/Asset.php
index 65ac6908..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)) {
@@ -133,7 +130,10 @@ class Pman_Core_Asset extends Pman {
         
         $compile_dir = session_save_path() . "/";
         
-        $module = (empty($module)) ? $ff->project : $module;
+        if (empty($module)) {
+            $module = $ff->project . (isset($ff->appNameShort) ?  '_' . $ff->appNameShort : '');
+        }
+        
         
         switch($type) {
             case 'js':
@@ -173,8 +173,12 @@ class Pman_Core_Asset extends Pman {
         }
         
         require_once 'System.php';
+        $ff = HTML_FlexyFramework::get();
         
         $mods = $this->modulesList();
+        $mods[] = $ff->project; // Pman - this was the old format...
+        $mods[] = ''; // Pman + appshortname..
+        
         foreach ($mods as $module) {
             $compile_dir = $this->getCompileDir('js', $module, false);