projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a64957
)
fix php8
author
Alan
<alan@roojs.com>
Fri, 22 Oct 2021 05:00:12 +0000
(13:00 +0800)
committer
Alan
<alan@roojs.com>
Fri, 22 Oct 2021 05:00:12 +0000
(13:00 +0800)
AssetTrait.php
patch
|
blob
|
history
JsCompile.php
patch
|
blob
|
history
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
6e8627e
..
f653e56
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-260,7
+260,7
@@
trait Pman_Core_AssetTrait {
file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset));
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset));
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
- !filesize($compiledir.'/'.$
r
output)) {
+ !filesize($compiledir.'/'.$output)) {
echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
$this->assetArrayToHtml($files,'css');
return;
echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
$this->assetArrayToHtml($files,'css');
return;
diff --git
a/JsCompile.php
b/JsCompile.php
index
397178b
..
c53bf6c
100644
(file)
--- a/
JsCompile.php
+++ b/
JsCompile.php
@@
-228,10
+228,6
@@
class Pman_Core_JsCompile extends Pman
return false;
}
return false;
}
- $o = HTML_FlexyFramework::get()->Pman_Core;
- if (isset($o['packseed'])) {
- return $this->packSeed($files,$output,$translation_base);
- }
require_once 'System.php';
require_once 'System.php';