aboutsummaryrefslogtreecommitdiffstats
path: root/include/channel.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-08 12:42:54 -0700
committerzotlabs <mike@macgirvin.com>2017-10-08 12:42:54 -0700
commit5cc6c6c1e97743b208b90f2a05b23196df787f36 (patch)
tree77b85421af0e0052f5b0ab23fc95abd51bc89728 /include/channel.php
parentd2e22d8c2f5ee7c0bca1fa63d39a6822582106e8 (diff)
parent991db280be4c3cbbff4fb1e4dae8f303a487ed3f (diff)
downloadvolse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.tar.gz
volse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.tar.bz2
volse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/channel.php')
-rw-r--r--include/channel.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php
index fef933ba7..488bdeef0 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1373,7 +1373,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
- // @fixme move this to the diaspora plugin itself
$contact_block = contact_block();