diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/VNDB/DB/Users.pm | 11 | ||||
| -rw-r--r-- | lib/VNDB/Handler/Users.pm | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/VNDB/DB/Users.pm b/lib/VNDB/DB/Users.pm index 63ac2270..bade6ca1 100644 --- a/lib/VNDB/DB/Users.pm +++ b/lib/VNDB/DB/Users.pm @@ -177,21 +177,14 @@ sub dbNotifyGet { ); my @join = ( - $o{what} =~ /titles/ ? ( - q|LEFT JOIN threads t ON n.ltype = 't' AND t.id = n.iid|, - q|LEFT JOIN threads_posts tp ON n.ltype = 't' AND tp.tid = t.id AND n.subid = tp.num|, - q|LEFT JOIN users tu ON tp.uid = tu.id| - ) : () + $o{what} =~ /titles/ ? 'LEFT JOIN users u ON n.c_byuser = u.id' : (), ); my @select = ( qw|n.id n.ntype n.ltype n.iid n.subid|, q|extract('epoch' from n.date) as date|, q|extract('epoch' from n.read) as read|, - $o{what} =~ /titles/ ? ( - q|COALESCE(t.title,'') AS title|, - q|COALESCE(tu.username,'') AS subtitle|, - ) : (), + $o{what} =~ /titles/ ? qw|u.username n.c_title| : (), ); my($r, $np) = $s->dbPage(\%o, q| diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm index 16111add..7ab21336 100644 --- a/lib/VNDB/Handler/Users.pm +++ b/lib/VNDB/Handler/Users.pm @@ -594,7 +594,7 @@ sub notifies { lit mt '_usern_n_'.( $l->{ltype} eq 't' ? ($l->{subid} == 1 ? 't_new' : 't_reply') : die("unknown notification type")), - sprintf('<i>%s</i>', xml_escape $l->{title}), sprintf('<i>%s</i>', xml_escape $l->{subtitle}); + sprintf('<i>%s</i>', xml_escape $l->{c_title}), sprintf('<i>%s</i>', xml_escape $l->{username}); end; end; }, |