Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 7dfdb49de4e103d6f881cdf2d909ce3f62e6a3c3..587ac6288e7b1cfa60b7a5dded955091bddf6a95 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -115,7 +115,9 @@ function profile_content(&$a, $update = 0) {
                        '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
                        '$status' => t('Status'),
                        '$profile' => t('Profile'),
-                       '$photos' => t('Photos')
+                       '$photos' => t('Photos'),
+                       '$events' => (($is_owner) ?     '<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
+                       '$notes' => (($is_owner) ?      '<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
                ));
 
 
@@ -259,11 +261,8 @@ function profile_content(&$a, $update = 0) {
        if($is_owner && ! $update)
                $o .= get_birthdays();
 
-
-
        $o .= conversation($a,$r,'profile',$update);
 
-
        if(! $update) {
                
                $o .= paginate($a);