diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
| commit | 4c0f9a91b95025f08e3c4e2739cb5f4186726023 (patch) | |
| tree | 3b19b8c3aa086e4931aac9790d298b2306f71ff7 /mod/ping.php | |
| parent | c26ae94592dda51a40903ea65f117fd7dd9d0ef3 (diff) | |
| parent | f62ec4132ed571288737423de386054a4cc8b0d5 (diff) | |
| download | volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.gz volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.bz2 volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.zip | |
Merge branch 'upstream'
Diffstat (limited to 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 6 |
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()), |