Permalink
Browse files

Merge branch 'live'

  • Loading branch information...
2 parents cae2bde + b3790b2 commit 84a2140dc4eb68b7ea28dc22e1f3d3a3657a1f14 @scc committed Dec 12, 2008
Showing with 3 additions and 3 deletions.
  1. +2 −2 plugins/FireHose/FireHose.pm
  2. +1 −1 plugins/FireHose/templates/data;firehose;default
@@ -1512,7 +1512,7 @@ sub ajaxFireHoseGetUpdates {
my $atstorytime;
$atstorytime = $user->{aton} . ' ' . timeCalc($item->{'createtime'});
- $title =~ s/\Q__TIME_TAG__\E/$atstorytime/;
+ $title =~ s/\Q__TIME_TAG__\E/$atstorytime/g;
$html->{"title-$_->{id}"} = $title;
my $introtext = $item->{introtext};
@@ -2007,7 +2007,7 @@ sub dispFireHose {
my $atstorytime;
$atstorytime = $user->{aton} . ' ' . timeCalc($item->{'createtime'});
- $retval =~ s/\Q__TIME_TAG__\E/$atstorytime/;
+ $retval =~ s/\Q__TIME_TAG__\E/$atstorytime/g;
return $retval;
}
@@ -75,7 +75,7 @@ __template__
[% IF extras && adminmode && num_with_ipid != '0' %]
([% accepted_from_ipid %]/[% num_with_ipid %])
[% END %]
- [% user.aton %] <span id="fhtime-[% item.id %]">[% Slash.timeCalc(item.createtime) %]</span></b>
+ <span id="fhtime-[% item.id %]">[% item.atstorytime %]</span></b>
[% IF item.type == "comment" %]
(<a href="[% gSkin.rootdir %]/comments.pl?sid=[% item.discussion %]&amp;cid=[% item.srcid %]">#[% item.srcid %]</a>)
[% END %]

0 comments on commit 84a2140

Please sign in to comment.