aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-13 10:08:20 +1100
committerfriendica <info@friendica.com>2014-02-13 10:08:20 +1100
commit11e6530d7fc6a14c50bf1b7776f40a2b6ee571f0 (patch)
tree498cb0113803c938e74a0b21fab57c3400229ac6 /include
parent2c1b366fdf18929e255a223bc88474b446eaafa8 (diff)
parent8e68ecc68bb84f9fa1f69ff4584982a7dc810462 (diff)
downloadvolse-hubzilla-11e6530d7fc6a14c50bf1b7776f40a2b6ee571f0.tar.gz
volse-hubzilla-11e6530d7fc6a14c50bf1b7776f40a2b6ee571f0.tar.bz2
volse-hubzilla-11e6530d7fc6a14c50bf1b7776f40a2b6ee571f0.zip
Merge pull request #312 from git-marijus/master
dont show onlinestatus if block_public is on
Diffstat (limited to 'include')
-rw-r--r--include/identity.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/identity.php b/include/identity.php
index 0e01b4a0d..12eeb47ac 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1154,6 +1154,9 @@ function is_member($s) {
function get_online_status($nick) {
+ if(get_config('system','block_public') && ! local_user() && ! remote_user())
+ return;
+
$ret = array('result' => false);
$r = q("select channel_id, channel_hash from channel where channel_address = '%s' limit 1",