From: john Date: Wed, 15 Aug 2018 09:21:32 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=8e6b3ee2791ab49a31a7109944d412d6dc4b1521 sync --- diff --git a/Asset.php b/Asset.php index 88937fa6..2b80a923 100644 --- a/Asset.php +++ b/Asset.php @@ -55,9 +55,6 @@ class Pman_Core_Asset extends Pman { $fn = $compile . '/'. $s .'.'. $bits[0]; - - - if (!file_exists($fn)) { header('Content-Type: '. $this->types[$bits[0]]); @@ -65,7 +62,6 @@ class Pman_Core_Asset extends Pman { exit; } - $supportsGzip = !empty($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) !== false; @@ -125,10 +121,10 @@ class Pman_Core_Asset extends Pman { static function getCompileDir($type) { - $ui = posix_getpwuid(posix_geteuid()); - $ff = HTML_FlexyFramework::get(); + $ui = posix_getpwuid(posix_geteuid()); + $compile_dir = session_save_path() . "/"; switch($type) { @@ -159,6 +155,8 @@ class Pman_Core_Asset extends Pman { function clearCompiledFilesCache() { - exit('testing'); + // using getCompileDir.. + + return; } } diff --git a/UpdateDatabase.php b/UpdateDatabase.php index e2630fa0..4d142aae 100644 --- a/UpdateDatabase.php +++ b/UpdateDatabase.php @@ -215,9 +215,8 @@ class Pman_Core_UpdateDatabase extends Pman $this->runExtensions(); $this->clearApacheDataobjectsCache(); - - } + function output() { echo "\nUpdate Completed SUCCESS\n"; return '';