Merge branch 'staff' into master

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

1 files changed, 2 insertions, 2 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;