diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-29 09:11:22 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-29 09:11:22 +0200 |
| commit | 3102440d407fe195878b9535aae4fd0da750f437 (patch) | |
| tree | b915e72f142daf09bdfb3e110a7fbf93d17b0f37 /Zotlabs | |
| parent | dcc65bbacb81801b5e138795c18ef9e740dbd26c (diff) | |
| parent | 715b1667d928175c0fac5832b998d9ded92974a3 (diff) | |
| download | volse-hubzilla-3102440d407fe195878b9535aae4fd0da750f437.tar.gz volse-hubzilla-3102440d407fe195878b9535aae4fd0da750f437.tar.bz2 volse-hubzilla-3102440d407fe195878b9535aae4fd0da750f437.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/SuperCurl.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Viewconnections.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Lib/SuperCurl.php b/Zotlabs/Lib/SuperCurl.php index fd47c399c..1c8583ff5 100644 --- a/Zotlabs/Lib/SuperCurl.php +++ b/Zotlabs/Lib/SuperCurl.php @@ -64,9 +64,9 @@ class SuperCurl { $this->auth = $v; break; case 'magicauth': + // currently experimental $this->magicauth = $v; \Zotlabs\Daemon\Master::Summon([ 'CurlAuth', $v ]); - sleep(2); break; case 'custom': $this->request_method = $v; diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index 7523c259b..4364d482a 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -10,8 +10,11 @@ class Viewconnections extends \Zotlabs\Web\Controller { if(observer_prohibited()) { return; } - if(argc() > 1) + + if(argc() > 1) { profile_load(argv(1)); + } + } function get() { |