diff options
| author | Friendika <info@friendika.com> | 2011-02-06 01:08:12 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-06 01:08:12 -0800 |
| commit | 4e63b0acb94b5db67dd1b054d9484bff70107bb2 (patch) | |
| tree | f774173438957fa0706818a7b07ca3990bfcb72d | |
| parent | d322bb461326adac29e4b3a16d6638de74da2348 (diff) | |
| download | volse-hubzilla-4e63b0acb94b5db67dd1b054d9484bff70107bb2.tar.gz volse-hubzilla-4e63b0acb94b5db67dd1b054d9484bff70107bb2.tar.bz2 volse-hubzilla-4e63b0acb94b5db67dd1b054d9484bff70107bb2.zip | |
ensure that jot_plugins inherit '$visitor' correctly
| -rw-r--r-- | mod/network.php | 9 | ||||
| -rw-r--r-- | mod/profile.php | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mod/network.php b/mod/network.php index 2ec06fe61..b0196f92a 100644 --- a/mod/network.php +++ b/mod/network.php @@ -79,8 +79,10 @@ function network_content(&$a, $update = 0) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $jotplugins = ""; - call_hooks('jot_tool', $jotplugins); + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + + $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, @@ -92,8 +94,7 @@ function network_content(&$a, $update = 0) { '$lockstate' => $lockstate, '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), - '$profile_uid' => $_SESSION['uid'], - '$jotplugins' => $jotplugins + '$profile_uid' => $_SESSION['uid'] )); 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'] )); } |