From f2420941ca3b23a893e764fb0e5672621f9998b1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 28 Oct 2015 18:35:22 +0100 Subject: [PATCH 1/2] magic of a dot --- irc/irc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc/irc.php b/irc/irc.php index f400a77c..0ac7be37 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -33,7 +33,7 @@ function irc_addon_settings(&$a,&$s) { $autochans = get_pconfig( local_user(), 'irc','autochans'); /* auto connect chans */ $t = get_markup_template( "settings.tpl", "addon/irc/" ); - $s = replace_macros($t, array( + $s .= replace_macros($t, array( '$header' => t('IRC Settings'), '$info' => t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'), '$submit' => t('Save Settings'), -- 2.49.1 From 9dfa86ead94534d0f93fff95872017533840d8bd Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 31 Oct 2015 23:06:59 +0100 Subject: [PATCH 2/2] Viewsrc will now work on the community page as well. --- viewsrc/viewsrc.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index 9366930f..687d9253 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -34,8 +34,26 @@ EOS; } function viewsrc_item_photo_menu(&$a,&$b) { - if((! local_user()) || (local_user() != $b['item']['uid'])) + if(!local_user()) return; - $b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']); + + if (local_user() != $b['item']['uid']) { + $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s'", + intval(local_user()), dbesc($b['item']['guid'])); + + if (!$r) + return; + + $item_id = $r[0]['id']; + + } else + $item_id = $b['item']['id']; + + $b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $item_id), $b['menu']); + + //if((! local_user()) || (local_user() != $b['item']['uid'])) + // return; + + //$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']); } -- 2.49.1