diff options
| author | Friendika <info@friendika.com> | 2011-10-10 12:56:51 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-10 12:56:51 -0700 |
| commit | caf18164f0f7bd336e61d4393dabf6d93c739879 (patch) | |
| tree | 15053927bc3605fb52af6e51d84cf055b93341b7 /mod/profile.php | |
| parent | 06c268b3db815d56a92bfabd8df297f5e4331689 (diff) | |
| parent | 2ea2e7f4b4a1f890cfcba95e92bf81a273042196 (diff) | |
| download | volse-hubzilla-caf18164f0f7bd336e61d4393dabf6d93c739879.tar.gz volse-hubzilla-caf18164f0f7bd336e61d4393dabf6d93c739879.tar.bz2 volse-hubzilla-caf18164f0f7bd336e61d4393dabf6d93c739879.zip | |
Merge branch 'pull'
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mod/profile.php b/mod/profile.php index 50bbdd46e..a453f72f1 100644 --- 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; |