friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Nope, get_basepath() should be static, then also mark it as static (in signature). 

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-13 14:53:57 +01:00
parent 63610c7b73
commit 797de5bfe0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -767,7 +767,7 @@ class App {
} }
function get_basepath() { public static function get_basepath() {
$basepath = get_config("system", "basepath"); $basepath = get_config("system", "basepath");

6
include/cron.php
View File

@ -362,14 +362,14 @@ function cron_clear_cache(&$a) {
clear_cache(); clear_cache();
// clear cache for photos // clear cache for photos
clear_cache($a->get_basepath(), $a->get_basepath()."/photo"); clear_cache(App::get_basepath(), App::get_basepath()."/photo");
// clear smarty cache // clear smarty cache
clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled"); clear_cache(App::get_basepath()."/view/smarty3/compiled", App::get_basepath()."/view/smarty3/compiled");
// clear cache for image proxy // clear cache for image proxy
if (!get_config("system", "proxy_disabled")) { if (!get_config("system", "proxy_disabled")) {
clear_cache($a->get_basepath(), $a->get_basepath()."/proxy"); clear_cache(App::get_basepath(), App::get_basepath()."/proxy");
$cachetime = get_config('system','proxy_cache_time'); $cachetime = get_config('system','proxy_cache_time');
if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME; if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;

2
mod/photo.php
View File

@ -197,7 +197,7 @@ function photo_init(&$a) {
// If the photo is public and there is an existing photo directory store the photo there // If the photo is public and there is an existing photo directory store the photo there
if ($public and ($file != "")) { if ($public and ($file != "")) {
// If the photo path isn't there, try to create it // If the photo path isn't there, try to create it
$basepath = $a->get_basepath(); $basepath = App::get_basepath();
if (!is_dir($basepath."/photo")) if (!is_dir($basepath."/photo"))
if (is_writable($basepath)) if (is_writable($basepath))
mkdir($basepath."/photo"); mkdir($basepath."/photo");

4
mod/proxy.php
View File

@ -44,7 +44,7 @@ function proxy_init() {
$thumb = false; $thumb = false;
$size = 1024; $size = 1024;
$sizetype = ""; $sizetype = "";
$basepath = $a->get_basepath(); $basepath = App::get_basepath();
// If the cache path isn't there, try to create it // If the cache path isn't there, try to create it
if (!is_dir($basepath."/proxy")) if (!is_dir($basepath."/proxy"))
@ -267,7 +267,7 @@ function proxy_url($url, $writemode = false, $size = '') {
$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8'); $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
// Creating a sub directory to reduce the amount of files in the cache directory // Creating a sub directory to reduce the amount of files in the cache directory
$basepath = $a->get_basepath() . '/proxy'; $basepath = App::get_basepath() . '/proxy';
$shortpath = hash('md5', $url); $shortpath = hash('md5', $url);
$longpath = substr($shortpath, 0, 2); $longpath = substr($shortpath, 0, 2);