projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
638e785
)
AssetTrait.php
author
edward
<edward@roojs.com>
Thu, 24 Mar 2016 05:42:28 +0000
(13:42 +0800)
committer
edward
<edward@roojs.com>
Thu, 24 Mar 2016 05:42:28 +0000
(13:42 +0800)
AssetTrait.php
patch
|
blob
|
history
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
a5b2f8d
..
0babc98
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-231,10
+231,10
@@
trait Pman_Core_AssetTrait {
usort($files, $lsort);
usort($relfiles,$lsort);
// print_R($relfiles);
usort($files, $lsort);
usort($relfiles,$lsort);
// print_R($relfiles);
- var_dump($this->bootLoader->isDev);
-
var_dump($_REQUEST);exit
;
+
+
$ff = HTML_FlexyFramework::get()
;
- if (!empty($
this->bootLoader
->isDev) && !empty($_REQUEST['isDev'])) {
+ if (!empty($
ff
->isDev) && !empty($_REQUEST['isDev'])) {
echo "<!-- CSS compile turned off (isDev on) -->\n";
$this->assetArrayToHtml($files,'css');
return;
echo "<!-- CSS compile turned off (isDev on) -->\n";
$this->assetArrayToHtml($files,'css');
return;