keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixing tests

This commit is contained in:
Philipp Holzer 2019-02-03 22:55:13 +01:00
parent 0f5a50b46b
commit 8b70ae6d46
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@ -634,7 +634,7 @@ function get_temppath()
$temppath = Config::get("system", "temppath"); $temppath = Config::get("system", "temppath");
if (($temppath != "") && App::isDirectoryUsable($temppath)) { if (($temppath != "") && BasePath::isDirectoryUsable($temppath)) {
// We have a temp path and it is usable // We have a temp path and it is usable
return BasePath::getRealPath($temppath); return BasePath::getRealPath($temppath);
} }
@ -643,7 +643,7 @@ function get_temppath()
$temppath = sys_get_temp_dir(); $temppath = sys_get_temp_dir();
// Check if it is usable // Check if it is usable
if (($temppath != "") && App::isDirectoryUsable($temppath)) { if (($temppath != "") && BasePath::isDirectoryUsable($temppath)) {
// Always store the real path, not the path through symlinks // Always store the real path, not the path through symlinks
$temppath = BasePath::getRealPath($temppath); $temppath = BasePath::getRealPath($temppath);
@ -654,7 +654,7 @@ function get_temppath()
mkdir($new_temppath); mkdir($new_temppath);
} }
if (App::isDirectoryUsable($new_temppath)) { if (BasePath::isDirectoryUsable($new_temppath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
Config::set("system", "temppath", $new_temppath); Config::set("system", "temppath", $new_temppath);
return $new_temppath; return $new_temppath;
@ -736,7 +736,7 @@ function get_itemcachepath()
} }
$itemcache = Config::get('system', 'itemcache'); $itemcache = Config::get('system', 'itemcache');
if (($itemcache != "") && App::isDirectoryUsable($itemcache)) { if (($itemcache != "") && BasePath::isDirectoryUsable($itemcache)) {
return BasePath::getRealPath($itemcache); return BasePath::getRealPath($itemcache);
} }
@ -748,7 +748,7 @@ function get_itemcachepath()
mkdir($itemcache); mkdir($itemcache);
} }
if (App::isDirectoryUsable($itemcache)) { if (BasePath::isDirectoryUsable($itemcache)) {
Config::set("system", "itemcache", $itemcache); Config::set("system", "itemcache", $itemcache);
return $itemcache; return $itemcache;
} }
@ -764,7 +764,7 @@ function get_itemcachepath()
function get_spoolpath() function get_spoolpath()
{ {
$spoolpath = Config::get('system', 'spoolpath'); $spoolpath = Config::get('system', 'spoolpath');
if (($spoolpath != "") && App::isDirectoryUsable($spoolpath)) { if (($spoolpath != "") && BasePath::isDirectoryUsable($spoolpath)) {
// We have a spool path and it is usable // We have a spool path and it is usable
return $spoolpath; return $spoolpath;
} }
@ -779,7 +779,7 @@ function get_spoolpath()
mkdir($spoolpath); mkdir($spoolpath);
} }
if (App::isDirectoryUsable($spoolpath)) { if (BasePath::isDirectoryUsable($spoolpath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
Config::set("system", "spoolpath", $spoolpath); Config::set("system", "spoolpath", $spoolpath);
return $spoolpath; return $spoolpath;