Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 17:55:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
zotlabs 2018-11-11 19:08:29 -08:00
commit fc6a5486bd
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Zotlabs/Lib/Libzotdir.php
View file

@ -97,19 +97,18 @@ class Libzotdir {
static function get_directory_setting($observer, $setting) {
if ($observer)
$ret = get_xconfig($observer, 'directory', $setting);
else
$ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
if($ret === false)
if($ret === false) {
$ret = get_config('directory', $setting);
// 'safemode' is the default if there is no observer or no established preference.
if($setting === 'safemode' && $ret === false)
$ret = 1;
if($ret === false) {
$default = (in_array($setting,['globaldir','safemode']) ? 1 : 0);
}
}
if($setting === 'globaldir' && intval(get_config('system','localdir_hide')))
$ret = 1;

2
Zotlabs/Module/Zot_probe.php
View file

@ -3,7 +3,7 @@
namespace Zotlabs\Module;
use Zotlabs\Lib\Zotfinger;
use Zotlabs\Zot6\HTTPSig;
use Zotlabs\Web\HTTPSig;
class Zot_probe extends \Zotlabs\Web\Controller {