From 0adf2f329054f621c832d9ddb0dca4d6a2a2a860 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 11 Nov 2018 17:49:38 -0800 Subject: [PATCH 1/3] rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index b9f837142..bf4b733bb 100755 --- a/boot.php +++ b/boot.php @@ -32,7 +32,7 @@ require_once('include/bbcode.php'); require_once('include/items.php'); -define ( 'STD_VERSION', '1.5' ); +define ( 'STD_VERSION', '1.7' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1222 ); From 0e124bb0da0ea43701680e28b14b28d6a2702717 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 11 Nov 2018 18:31:48 -0800 Subject: [PATCH 2/3] change directory default --- Zotlabs/Lib/Libzotdir.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php index 81a5b3319..689f63385 100644 --- a/Zotlabs/Lib/Libzotdir.php +++ b/Zotlabs/Lib/Libzotdir.php @@ -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; From 30b59024967b24a1c72b5e179f3745df07344c01 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 11 Nov 2018 18:51:05 -0800 Subject: [PATCH 3/3] regression --- Zotlabs/Module/Zot_probe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php index 7f9283abd..6a5077788 100644 --- a/Zotlabs/Module/Zot_probe.php +++ b/Zotlabs/Module/Zot_probe.php @@ -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 {