X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Asset.php;h=92e43cbba844120cd4a1481d8489fcd7caa342bf;hp=ae1bd61a442592a7310eff793b1b1c379dee08ed;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=b0c0197b94a498a92de3155e5711c37418f6986f diff --git a/Asset.php b/Asset.php index ae1bd61a..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,10 +49,8 @@ class Pman_Core_Asset extends Pman { $ui = posix_getpwuid(posix_geteuid()); $ff = HTML_FlexyFramework::get(); - $compile = self::getCompileDir($bits[0]); - //'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)) { @@ -177,9 +173,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) {