projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86591d5
)
getcompileDir can fail - and return empty
author
Alan
<alan@roojs.com>
Thu, 10 Aug 2023 10:15:42 +0000
(18:15 +0800)
committer
Alan
<alan@roojs.com>
Thu, 10 Aug 2023 10:15:42 +0000
(18:15 +0800)
Asset.php
patch
|
blob
|
history
AssetTrait.php
patch
|
blob
|
history
diff --git
a/Asset.php
b/Asset.php
index
9b546c0
..
3e49f8e
100644
(file)
--- a/
Asset.php
+++ b/
Asset.php
@@
-158,6
+158,7
@@
class Pman_Core_Asset extends Pman {
return false;
}
+
if (file_exists($compile_dir)) {
return $compile_dir;
}
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
27b9c4b
..
0067d6f
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-78,8
+78,8
@@
trait Pman_Core_AssetTrait {
$ff = HTML_FlexyFramework::get();
- if (
!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev']
)) {
- echo "<!-- Javascript compile turned off (isDev on) -->\n";
+ if (
empty($compiledir) || (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])
)) {
+ echo "<!-- Javascript compile turned off (isDev on
or mkdir failed
) -->\n";
$this->assetArrayToHtml($files,'js');
return;
}