aboutsummaryrefslogtreecommitdiffstats
path: root/mod/ping.php
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-07 13:50:18 +0100
committermarijus <mario@localhost.localdomain>2014-02-07 13:50:18 +0100
commit6dd05bb53fb7892a386740f6ee246649f6f70e1e (patch)
treecb959c7969402bcc3a70acfb5088ec34f43402f5 /mod/ping.php
parent6f2c168d1a434b2223f09a922780617fdc07b278 (diff)
parentc80325b4279b6f19540416064382755ca5e6eccd (diff)
downloadvolse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.gz
volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.tar.bz2
volse-hubzilla-6dd05bb53fb7892a386740f6ee246649f6f70e1e.zip
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'mod/ping.php')
-rw-r--r--mod/ping.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/ping.php b/mod/ping.php
index 4b07fee7a..b9d9a9c77 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -43,6 +43,12 @@ function ping_init(&$a) {
unset($_SESSION['sysmsg_info']);
}
+ if($a->install) {
+ echo json_encode($result);
+ killme();
+ }
+
+
if(get_observer_hash() && (! $result['invalid'])) {
$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
dbesc(get_observer_hash()),