Pman.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index ce2a088..ae1bef0 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -157,7 +157,8 @@ class Pman extends HTML_FlexyFramework_Page
             if (method_exists($c, $fn)) {
                 call_user_func_array(array($c,$fn),$args);
             }
-         }
+        }
+        return $args;
      }
     
     function get($base, $opts=array()) 
@@ -246,7 +247,9 @@ class Pman extends HTML_FlexyFramework_Page
         if (!is_a($this->company, 'DB_DataObject')) { // non-core pman projects
             return false; 
         }
-        $this->company->get('comptype', 'OWNER');
+        $e = DB_DataObject::Factory('core_enum')->lookupObject('COMPTYPE', 'OWNER');
+
+        $this->company->get('comptype_id', $e->id);
         return $this->company;
     }
     
@@ -734,7 +737,7 @@ class Pman extends HTML_FlexyFramework_Page
         $this->callModules('outputJavascriptIncludes', $this);
          
     }
-    
+    var $css_includes = array();
      /**
      * outputCSSIncludes:
      *
@@ -749,6 +752,9 @@ class Pman extends HTML_FlexyFramework_Page
         
         $mods = $this->modulesList();
         
+        $this->callModules('applyCSSIncludes', $this);
+        
+        
         $this->callModules('outputCSSIncludes', $this);
         
         foreach($mods as $mod) {