diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
| commit | 99354ac57622002c0bbd820235d03321406f8d39 (patch) | |
| tree | f8ad698a1c901f757dfc4354721846c8be82ab7e /Zotlabs/Web/WebServer.php | |
| parent | e7b853175154688d60d83ca5935650d1128973c6 (diff) | |
| parent | f396b1bf735a7dc9eb3632e49c1269de54777c6d (diff) | |
| download | volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2 volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'Zotlabs/Web/WebServer.php')
| -rw-r--r-- | Zotlabs/Web/WebServer.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 88ab4995b..d4f3cb9ea 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -59,7 +59,14 @@ class WebServer { \App::$query_string = strip_zids(\App::$query_string); if(! local_channel()) { $_SESSION['my_address'] = $_GET['zid']; - zid_init($a); + zid_init(); + } + } + + if((x($_GET,'zat')) && (! \App::$install)) { + \App::$query_string = strip_zats(\App::$query_string); + if(! local_channel()) { + zat_init(); } } |