autocomplete contacts nickname while writting in a comment box.

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 50bbdd46e46e8c7c1ec46999b86730efb532124d..6d67ab74b2e651e5d1b68945e90e6a3434dfc54d 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -110,18 +110,7 @@ function profile_content(&$a, $update = 0) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
-               $tpl = get_markup_template('profile_tabs.tpl');
-
-               $o .= replace_macros($tpl,array(
-                       '$url' => $a->get_baseurl() . '/' . $a->cmd,
-                       '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
-                       '$status' => t('Status'),
-                       '$profile' => t('Profile'),
-                       '$photos' => t('Photos'),
-                       '$events' => (($is_owner) ? t('Events') : ''),
-                       '$notes' => (($is_owner) ?      t('Personal Notes') : ''),
-                       '$activetab' => $tab,
-               ));
+               $o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
 
 
                if($tab === 'profile') {
@@ -131,6 +120,8 @@ function profile_content(&$a, $update = 0) {
                        return $o;
                }
 
+
+
                if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
                        $o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
 
@@ -232,8 +223,10 @@ function profile_content(&$a, $update = 0) {
                );
        }
 
-       if($is_owner && ! $update)
+       if($is_owner && ! $update) {
                $o .= get_birthdays();
+               $o .= get_events();
+       }
 
        $o .= conversation($a,$r,'profile',$update);