diff options
author | Yorhel <git@yorhel.nl> | 2015-02-14 08:03:49 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2015-02-14 08:04:16 +0100 |
commit | a0414ad065365b42eb95ec0a90d9a4aa900b70ad (patch) | |
tree | 698200e10a21b7be81d3c39a5af40de31284a6da | |
parent | d95b3ec9a738d5636a221db2f7f8cfa77171ae6f (diff) | |
parent | 5cec32d98f108c570dc252ecfe6be76cc33a42de (diff) |
Merge branch 'master' of g.blicky.net:vndb
Ugh I hate merge commits, but for some reason 'git rebase' doesn't allow
empty email addreses, and refuses to rebase my commits. :-(
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index fbaf00d7..894f9534 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -710,8 +710,10 @@ sub _revision { $_[0] ? sprintf '<a href="http://renai.us/game/%s.shtml">%1$s</a>', xml_escape $_[0] : mt '_revision_nolink' }], [ credits => join => '<br />', split => sub { - my @r = map sprintf('<a href="/s%d" title="%s">%s</a> [%s]%s', - $_->{id}, xml_escape($_->{original}||$_->{name}), xml_escape($_->{name}), mt("_credit_$_->{role}"), $_->{note} ? ' ['.xml_escape($_->{note}).']' : ''), sort { $a->{id} <=> $b->{id} } @{$_[0]}; + my @r = map sprintf('<a href="/s%d" title="%s">%s</a> [%s]%s', $_->{id}, + xml_escape($_->{original}||$_->{name}), xml_escape($_->{name}), mt("_credit_$_->{role}"), + $_->{note} ? ' ['.xml_escape($_->{note}).']' : ''), + sort { $a->{id} <=> $b->{id} || $a->{role} cmp $b->{role} } @{$_[0]}; return @r ? @r : (mt '_revision_empty'); }], [ seiyuu => join => '<br />', split => sub { @@ -719,7 +721,7 @@ sub _revision { $_->{id}, xml_escape($_->{original}||$_->{name}), xml_escape($_->{name}), mt('_staff_as', xml_escape($_->{cname})), $_->{note} ? ' ['.xml_escape($_->{note}).']' : ''), - sort { $a->{id} <=> $b->{id} } @{$_[0]}; + sort { $a->{id} <=> $b->{id} || $a->{cid} <=> $b->{cid} || $a->{note} cmp $b->{note} } @{$_[0]}; return @r ? @r : (mt '_revision_empty'); }], [ relations => join => '<br />', split => sub { |