diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/page.php | 19 | ||||
| -rw-r--r-- | mod/webpages.php | 8 |
2 files changed, 24 insertions, 3 deletions
diff --git a/mod/page.php b/mod/page.php index 62f9d9204..e1274fff6 100644 --- a/mod/page.php +++ b/mod/page.php @@ -2,6 +2,23 @@ require_once('include/items.php'); require_once('include/conversation.php'); +function page_init(&$a) { + // We need this to make sure the channel theme is always loaded. + $which = argv(1); + $profile = 0; + $channel = $a->get_channel(); + + if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + } + + profile_load($a,$which,$profile); + +} + + + function page_content(&$a) { @@ -41,4 +58,4 @@ function page_content(&$a) { $o .= prepare_page($r[0]); return $o; -}
\ No newline at end of file +} diff --git a/mod/webpages.php b/mod/webpages.php index 3a3e30309..3cb3ec6bd 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -34,7 +34,7 @@ require_once ('include/conversation.php'); $x = array( 'webpage' => 1, 'is_owner' => true, - 'nickname' => $channel['channel_address'], + 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', @@ -65,7 +65,11 @@ $r = q("select * from item_id where uid = %d and service = 'WEBPAGE'", // This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM). return $o . replace_macros(get_markup_template("webpagelist.tpl"), array( - '$pages' => $pages + '$editlink' => t('Edit'), + '$pages' => $pages, + '$channel' => $a->profile['channel_address'], + '$view' => t('View'), + )); |