Merge branch 'pull'

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 66fa175543aca7fd75b4e869078ac80742e6b9fc..a453f72f1f94124c1bcb649fb4d9e9eb81cbcde0 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;
 
@@ -239,7 +230,6 @@ function profile_content(&$a, $update = 0) {
 
        if(! $update) {
                $o .= paginate($a);
-               $o .= cc_license();
        }
 
        return $o;