diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
commit | 97b608db38edac6e4989c7343e9de8f32f46f263 (patch) | |
tree | b303d7bf32e58abcd22efcc6fe0d9171284a3337 /mod/profile.php | |
parent | 64be33a3ff9ddae16ba7a57c842441a2d0058a5b (diff) | |
parent | ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a (diff) | |
download | volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.gz volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.bz2 volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.zip |
Merge branch 'friendika-master'
Diffstat (limited to 'mod/profile.php')
-rw-r--r-- | mod/profile.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mod/profile.php b/mod/profile.php index 91c1ba6d8..3b4616a34 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -135,9 +135,11 @@ function profile_content(&$a, $update = 0) { else $lockstate = 'unlock'; - $jotplugins = ""; - call_hooks('jot_tool', $jotplugins); - + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + + $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + $o .= replace_macros($tpl,array( '$baseurl' => $a->get_baseurl(), '$defloc' => (($is_owner) ? $a->user['default-location'] : ''), @@ -148,8 +150,7 @@ function profile_content(&$a, $update = 0) { '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$bang' => '', '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), - '$profile_uid' => $a->profile['profile_uid'], - '$jotplugins' => $jotplugins + '$profile_uid' => $a->profile['profile_uid'] )); } |