fix "Anonymous Coward's Friends' Journals"

scc · Dec 12, 2008 · f4916a3 · f4916a3
1 parent b3790b2
commit f4916a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/plugins/FireHose/FireHose.pm b/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});
+				$opts->{user_view} = $self->getUser($form->{user_view_id}) || $user;
-				if(!$opts->{user_view}) {
-					$opts->{user_view} = $user;
-				}
 			}
 		}
 		my $the_nickname = $opts->{user_view}{nickname};

diff --git a/plugins/FireHose/templates/list;firehose;default b/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 %]
+	[%- END; this_user_nickname = Slash.db.getUser(options.user_view_uid, 'nickname') # options.user_view is not always there ... %]
-	<a href="[% constants.real_rootdir %]/~[% user.nickname | strip_paramattr %]/journal/friends">[% user.nickname | strip_literal %]'s Friends' Journals</a>
+	<a href="[% constants.real_rootdir %]/~[% this_user_nickname | strip_paramattr %]/journal/friends">[% this_user_nickname | strip_literal %]'s Friends' Journals</a>
 </div></div>
 
 [% END %]