Merge branch 'staff' into master

Conflicts:
	lib/VNDB/DB/VN.pm
	lib/VNDB/Handler/VNPage.pm

4 files changed, 9 insertions, 10 deletions

diff --git a/lib/VNDB/DB/Chars.pm b/lib/VNDB/DB/Chars.pm
index cea16258..2f7de43f 100644
--- a/lib/VNDB/DB/Chars.pm
+++ b/lib/VNDB/DB/Chars.pm
@@ -25,7 +25,8 @@ sub dbCharGet {
 
   my %where = (
     !$o{id} && !$o{rev} ? ( 'c.hidden = FALSE' => 1 ) : (),
-    $o{id}  ? ( 'c.id = ?'  => $o{id} ) : (),
+    $o{id} ? (
+      'c.id IN(!l)' => [ ref $o{id} ? $o{id} : [$o{id}] ] ) : (),
     $o{rev} ? ( 'h.rev = ?' => $o{rev} ) : (),
     $o{notid}    ? ( 'c.id <> ?'   => $o{notid} ) : (),
     $o{instance} ? ( 'cr.main = ?' => $o{instance} ) : (),
@@ -157,6 +158,5 @@ sub dbCharImageId {
 }
 
 
-
 1;
 
diff --git a/lib/VNDB/DB/Producers.pm b/lib/VNDB/DB/Producers.pm
index 4c4c1145..3ff70ae1 100644
--- a/lib/VNDB/DB/Producers.pm
+++ b/lib/VNDB/DB/Producers.pm
@@ -25,7 +25,7 @@ sub dbProducerGet {
     !$o{id} && !$o{rev} ? (
       'p.hidden = FALSE' => 1 ) : (),
     $o{id} ? (
-      'p.id = ?' => $o{id} ) : (),
+      'p.id IN(!l)' => [ ref $o{id} ? $o{id} : [$o{id}] ] ) : (),
     $o{search} ? (
       '(pr.name ILIKE ? OR pr.original ILIKE ? OR pr.alias ILIKE ?)', [ map '%'.$o{search}.'%', 1..3 ] ) : (),
     $o{char} ? (
diff --git a/lib/VNDB/DB/ULists.pm b/lib/VNDB/DB/ULists.pm
index a0cf4f18..6831e579 100644
--- a/lib/VNDB/DB/ULists.pm
+++ b/lib/VNDB/DB/ULists.pm
@@ -101,18 +101,17 @@ sub dbVNListList {
     );
 
     if(@$rel) {
-      my %rel = map {
-        $_->{languages}=[];
-        $_->{latest}, $_->{languages}
-      } @$rel;
-
+      my %rel = map { $_->{latest} => [] } @$rel;
       push(@{$rel{$_->{rid}}}, $_->{lang}) for (@{$self->dbAll(q|
         SELECT rid, lang
           FROM releases_lang
           WHERE rid IN(!l)|,
         [ keys %rel ]
       )});
-      push @{$vns{$_->{vid}}}, $_ for @$rel;
+      for(@$rel) {
+        $_->{languages} = $rel{$_->{latest}};
+        push @{$vns{$_->{vid}}}, $_;
+      }
     }
   }
 
diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm
index e08b85e3..b3b55598 100644
--- a/lib/VNDB/DB/VN.pm
+++ b/lib/VNDB/DB/VN.pm
@@ -32,7 +32,7 @@ sub dbVNGet {
 
   my @where = (
     $o{id} ? (
-      'v.id = ?' => $o{id} ) : (),
+      'v.id IN(!l)' => [ ref $o{id} ? $o{id} : [$o{id}] ] ) : (),
     $o{rev} ? (
       'c.rev = ?' => $o{rev} ) : (),
     $o{char} ? (