diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
| commit | 6892ba4cd8668ec48d036876d999ed9685165256 (patch) | |
| tree | 413576d1912df0fe6a9b5197d851659affca52ab /include/conversation.php | |
| parent | 7972de13caf21647c8cc2e82c499a344f7191a22 (diff) | |
| parent | 5ad9b48f1d916425e41f475319c7237293d055b9 (diff) | |
| download | volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.gz volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.bz2 volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
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, |