jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ensure that jot_plugins inherit '$visitor' correctly

Browse source
This commit is contained in:
Friendika 2011-02-06 01:08:12 -08:00
parent d322bb4613
commit 4e63b0acb9
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/network.php
View file

@ -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']
));

11
mod/profile.php
View file

@ -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']
));
}