X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=6d67ab74b2e651e5d1b68945e90e6a3434dfc54d;hb=6a8b96709e13b04a0657c25b4538c160e2118131;hp=2dd5df75855079153c9bb47e5b22736baa50b510;hpb=bdd71b10bef1aa03961fb9c0e2b95c36e9acb096;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index 2dd5df7585..6d67ab74b2 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -70,8 +70,9 @@ function profile_content(&$a, $update = 0) {
 		$a->profile['profile_uid'] = $update;
 	}
 	else {
-		if($a->profile['profile_uid'] == local_user())		
-			$o .= '<script>	$(document).ready(function() { $(\'#nav-home-link\').addClass(\'nav-selected\'); });</script>';
+		if($a->profile['profile_uid'] == local_user()) {
+			nav_set_selected('home');
+		}
 	}
 
 	$contact = null;
@@ -109,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') {
@@ -130,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;
 
@@ -231,14 +223,15 @@ 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);
 
 	if(! $update) {
 		$o .= paginate($a);
-		$o .= cc_license();
 	}
 
 	return $o;