Browse files

Merge branch 'live'

  • Loading branch information...
2 parents 84a2140 + f4916a3 commit 7f6a1fc01a9be187cf6e2917d10b7406e5f25285 @scc committed Dec 12, 2008
Showing with 3 additions and 6 deletions.
  1. +1 −4 plugins/FireHose/FireHose.pm
  2. +2 −2 plugins/FireHose/templates/list;firehose;default
View
5 plugins/FireHose/FireHose.pm
@@ -2531,10 +2531,7 @@ sub getAndSetOptions {
if ($fhfilter =~ /\{nickname\}/) {
if (!$opts->{user_view}) {
if ($form->{user_view_uid}) {
- $opts->{user_view} = $self->getUser($form->{user_view_id});
- if(!$opts->{user_view}) {
- $opts->{user_view} = $user;
- }
+ $opts->{user_view} = $self->getUser($form->{user_view_id}) || $user;
}
}
my $the_nickname = $opts->{user_view}{nickname};
View
4 plugins/FireHose/templates/list;firehose;default
@@ -47,8 +47,8 @@ __template__
[% IF user.uid == options.user_view_uid -%]
<a href="[% constants.real_rootdir %]/journal.pl?op=list">Manage Journal Entries</a> |
<a href="[% constants.real_rootdir %]/journal.pl?op=editprefs">Edit Journal Preferences</a> |
- [%- END %]
- <a href="[% constants.real_rootdir %]/~[% user.nickname | strip_paramattr %]/journal/friends">[% user.nickname | strip_literal %]'s Friends' Journals</a>
+ [%- END; this_user_nickname = Slash.db.getUser(options.user_view_uid, 'nickname') # options.user_view is not always there ... %]
+ <a href="[% constants.real_rootdir %]/~[% this_user_nickname | strip_paramattr %]/journal/friends">[% this_user_nickname | strip_literal %]'s Friends' Journals</a>
</div></div>
[% END %]

0 comments on commit 7f6a1fc

Please sign in to comment.