Merge remote-tracking branch 'upstream/master'

1 files changed, 20 insertions, 0 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 1ade8ed3a..e2dfccac9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1595,8 +1595,17 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
 	if (is_null($nickname))
 		$nickname  = $channel['channel_address'];
 
+
 	$uid = (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : local_channel());
 
+	if($uid == local_channel()) {
+		$cal_link = '/events';
+	}
+	else {
+		$cal_link = '/cal/' . $nickname;
+	}
+
+
 	if (get_pconfig($uid, 'system', 'noprofiletabs'))
 		return;
 
@@ -1644,6 +1653,17 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
 		);
 	}
 
+	if($p['view_stream']) {
+		$tabs[] = array(
+			'label' => t('Events'),
+			'url'   => $a->get_baseurl() . $cal_link,
+			'sel'   => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''),
+			'title' => t('Events'),
+			'id'    => 'event-tab',
+		);
+	}
+
+
 	if ($p['chat']) {
 		require_once('include/chat.php');
 		$has_chats = chatroom_list_count($uid);