diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
| commit | cf5383fdbe273af6b3858e216b313124fd125cf6 (patch) | |
| tree | a220d55b6624c76421a6173aec785958103aa92a /include/conversation.php | |
| parent | 21f2df399d3e21b6322ece16717efe88bcc21621 (diff) | |
| parent | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (diff) | |
| download | volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.gz volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.bz2 volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index e2dfccac9..39119b2bb 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1599,7 +1599,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ $uid = (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : local_channel()); if($uid == local_channel()) { - $cal_link = '/events'; + $cal_link = ''; } else { $cal_link = '/cal/' . $nickname; @@ -1653,7 +1653,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ ); } - if($p['view_stream']) { + if($p['view_stream'] && $cal_link) { $tabs[] = array( 'label' => t('Events'), 'url' => $a->get_baseurl() . $cal_link, |