aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-26 13:59:20 -0800
committerFriendika <info@friendika.com>2011-01-26 13:59:20 -0800
commit05350082fab123a1ba01340d3fef95f4edf6fb5b (patch)
tree82c1a04931b1942a2067d2cf60a26f96e127306c /mod
parentc3691b3331d4aa26ff7fb1294b7ef5218aa241ec (diff)
parent43be72297a281b41e7b77ba6078aeb48ee007299 (diff)
downloadvolse-hubzilla-05350082fab123a1ba01340d3fef95f4edf6fb5b.tar.gz
volse-hubzilla-05350082fab123a1ba01340d3fef95f4edf6fb5b.tar.bz2
volse-hubzilla-05350082fab123a1ba01340d3fef95f4edf6fb5b.zip
Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php6
-rw-r--r--mod/profile.php7
2 files changed, 11 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index 02e458d8f..50d7134c1 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -79,6 +79,9 @@ 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);
+
$o .= replace_macros($tpl,array(
'$return_path' => $a->cmd,
'$baseurl' => $a->get_baseurl(),
@@ -87,7 +90,8 @@ function network_content(&$a, $update = 0) {
'$lockstate' => $lockstate,
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
'$bang' => (($group) ? '!' : ''),
- '$profile_uid' => $_SESSION['uid']
+ '$profile_uid' => $_SESSION['uid'],
+ '$jotplugins' => $jotplugins
));
diff --git a/mod/profile.php b/mod/profile.php
index 505edf5ce..c84b493c5 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -134,6 +134,10 @@ function profile_content(&$a, $update = 0) {
$lockstate = 'lock';
else
$lockstate = 'unlock';
+
+ $jotplugins = "";
+ call_hooks('jot_tool', $jotplugins);
+
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
'$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
@@ -142,7 +146,8 @@ function profile_content(&$a, $update = 0) {
'$lockstate' => $lockstate,
'$bang' => '',
'$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
- '$profile_uid' => $a->profile['profile_uid']
+ '$profile_uid' => $a->profile['profile_uid'],
+ '$jotplugins' => $jotplugins
));
}