From 2eb3727542eca75c2a090ef1c9d4e0b2a47a206b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 15 Dec 2016 10:05:18 +0100 Subject: [PATCH] Again, static *OR* object-referencing calls? Blue or red pill? MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/cron.php | 6 +++--- mod/proxy.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/cron.php b/include/cron.php index 008260592f..d7771c08b8 100644 --- a/include/cron.php +++ b/include/cron.php @@ -362,14 +362,14 @@ function cron_clear_cache(&$a) { clear_cache(); // clear cache for photos - clear_cache(App::get_basepath(), App::get_basepath()."/photo"); + clear_cache($a->get_basepath(), $a->get_basepath()."/photo"); // clear smarty cache - clear_cache(App::get_basepath()."/view/smarty3/compiled", App::get_basepath()."/view/smarty3/compiled"); + clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled"); // clear cache for image proxy if (!get_config("system", "proxy_disabled")) { - clear_cache(App::get_basepath(), App::get_basepath()."/proxy"); + clear_cache($a->get_basepath(), $a->get_basepath()."/proxy"); $cachetime = get_config('system','proxy_cache_time'); if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME; diff --git a/mod/proxy.php b/mod/proxy.php index 1d27d70384..612dc910a0 100644 --- a/mod/proxy.php +++ b/mod/proxy.php @@ -267,7 +267,7 @@ function proxy_url($url, $writemode = false, $size = '') { $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8'); // Creating a sub directory to reduce the amount of files in the cache directory - $basepath = App::get_basepath() . '/proxy'; + $basepath = $a->get_basepath() . '/proxy'; $shortpath = hash('md5', $url); $longpath = substr($shortpath, 0, 2); -- 2.39.5