DataObjects/Core_ip_access.php

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index a5b2f8d..cadc2cc 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -78,8 +78,9 @@ trait Pman_Core_AssetTrait {
         $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
         usort($files, $lsort);
         
+        $ff = HTML_FlexyFramework::get();
         
-        if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) {
+        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
             echo "<!-- Javascript compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'js');
             return;
@@ -90,7 +91,8 @@ trait Pman_Core_AssetTrait {
         
         $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.js';
          
-         
+        
+        
         
         // where are we going to write all of this..
         // This has to be done via a 
@@ -231,10 +233,10 @@ trait Pman_Core_AssetTrait {
         usort($files, $lsort);
         usort($relfiles,$lsort);
        // print_R($relfiles);
-       var_dump($this->bootLoader->isDev);
-       var_dump($_REQUEST);exit;
-       
-        if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) {
+        
+        $ff = HTML_FlexyFramework::get();
+        
+        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
             echo "<!-- CSS compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'css');
             return;