Asset.php

[Pman.Core] / Asset.php

diff --git a/Asset.php b/Asset.php
index 583e538..8a57671 100644 (file)
--- a/Asset.php
+++ b/Asset.php
@@ -133,7 +133,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':
@@ -175,16 +178,19 @@ class Pman_Core_Asset extends Pman {
         require_once 'System.php';
         
         $mods = $this->modulesList();
-        foreach ($mods as $mod) {
+        $mods[] = $ff->project;
+        $mods[] = $ff->project;
+        
+        foreach ($mods as $module) {
             $compile_dir = $this->getCompileDir('js', $module, false);
         
             if(!empty($compile_dir)) {
-                System::rm(array('-r', $compiledir));
+                System::rm(array('-r', $compile_dir));
             }
             $compile_dir = $this->getCompileDir('css', $module, false);
         
             if(!empty($compile_dir)) {
-                System::rm(array('-r', $compiledir));
+                System::rm(array('-r', $compile_dir));
             }
         }