aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-10-10 07:33:41 -0700
committerfabrixxm <fabrix.xm@gmail.com>2011-10-10 07:33:41 -0700
commited07a4def34a44be323a9b0d61e2d9eb0701ec4a (patch)
tree960cb038d94a5c7715a59e5346358e9ae7afe5e8 /mod/profile.php
parent3174847de80600be5e0bf32864edca79388d6433 (diff)
parentf64e2d63b9ee66482b3461ecb6ee8f7776e23b87 (diff)
downloadvolse-hubzilla-ed07a4def34a44be323a9b0d61e2d9eb0701ec4a.tar.gz
volse-hubzilla-ed07a4def34a44be323a9b0d61e2d9eb0701ec4a.tar.bz2
volse-hubzilla-ed07a4def34a44be323a9b0d61e2d9eb0701ec4a.zip
Merge pull request #26 from fabrixxm/master
New common tab template. Updated css
Diffstat (limited to 'mod/profile.php')
-rw-r--r--mod/profile.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/mod/profile.php b/mod/profile.php
index 50bbdd46e..9da0784d3 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);
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;