diff options
| author | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
|---|---|---|
| committer | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
| commit | 7cbc9315a6e4315a62da080381f300e3b5d80f56 (patch) | |
| tree | dfbcfa6714ac23bd8cb6271948a3017b7059c645 /lib | |
| parent | b541d72849cd859580e7e6d7232165c92aa3a40b (diff) | |
| parent | 3f69720f88396543c34a682093f147afbef75c65 (diff) | |
Merge branch 'master' into beta
Conflicts:
data/lang.txt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/VNDB/DB/VN.pm | 4 | ||||
| -rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm index a29870a1..cb1a878c 100644 --- a/lib/VNDB/DB/VN.pm +++ b/lib/VNDB/DB/VN.pm @@ -90,8 +90,8 @@ sub dbVNGet { $o{what} =~ /relgraph/ ? 'vg.svg' : (), $o{what} =~ /rating/ ? (qw|v.c_popularity v.c_rating v.c_votecount|) : (), $o{what} =~ /ranking/ ? ( - '(SELECT COUNT(*)+1 FROM vn iv WHERE iv.hidden = false AND iv.c_popularity > v.c_popularity) AS p_ranking', - '(SELECT COUNT(*)+1 FROM vn iv WHERE iv.hidden = false AND iv.c_rating > v.c_rating) AS r_ranking', + '(SELECT COUNT(*)+1 FROM vn iv WHERE iv.hidden = false AND iv.c_popularity > COALESCE(v.c_popularity, 0.0)) AS p_ranking', + '(SELECT COUNT(*)+1 FROM vn iv WHERE iv.hidden = false AND iv.c_rating > COALESCE(v.c_rating, 0.0)) AS r_ranking', ) : (), # TODO: optimize this, as it will be very slow when the selected tags match a lot of VNs (>1000) $tag_ids ? diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm index fa8bf02b..eb086bcd 100644 --- a/lib/VNDB/Util/LayoutHTML.pm +++ b/lib/VNDB/Util/LayoutHTML.pm @@ -64,9 +64,7 @@ sub _menu { a href => '/hist', mt '_menu_recent_changes'; br; a href => '/t', mt '_menu_discussion_board'; br; a href => '/d6', mt '_menu_faq'; br; - a href => '/v/rand', mt '_menu_randvn'; br; - a href => 'irc://irc.synirc.net/vndb', '#vndb'; - lit ' (<a href="http://cgiirc.synirc.net/?chan=%23vndb">'.mt('_menu_webchat').'</a>)'; + a href => '/v/rand', mt '_menu_randvn'; end; form action => '/v/all', method => 'get', id => 'search'; fieldset; @@ -148,6 +146,8 @@ sub htmlFooter { txt "vndb $self->{version} | "; a href => '/d7', mt '_footer_aboutus'; txt ' | '; + a href => 'irc://irc.synirc.net/vndb', '#vndb'; + txt ' | '; a href => "mailto:$self->{admin_email}", $self->{admin_email}; txt ' | '; a href => $self->{source_url}, mt '_footer_source'; |