projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SimpleExcel.php
[Pman.Core]
/
Asset.php
diff --git
a/Asset.php
b/Asset.php
index
65ac690
..
92e43cb
100644
(file)
--- a/
Asset.php
+++ b/
Asset.php
@@
-36,8
+36,6
@@
class Pman_Core_Asset extends Pman {
function get($s='', $opts = Array())
{
function get($s='', $opts = Array())
{
-
-
$this->sessionState(0);
$bits = explode('/', $s);
$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();
$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)) {
$fn = $compile . '/'. $s .'.'. $bits[0];
if (!file_exists($fn)) {
@@
-133,7
+130,10
@@
class Pman_Core_Asset extends Pman {
$compile_dir = session_save_path() . "/";
$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':
switch($type) {
case 'js':
@@
-173,8
+173,12
@@
class Pman_Core_Asset extends Pman {
}
require_once 'System.php';
}
require_once 'System.php';
+ $ff = HTML_FlexyFramework::get();
$mods = $this->modulesList();
$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);
foreach ($mods as $module) {
$compile_dir = $this->getCompileDir('js', $module, false);