Merge branch 'beta'2.16

Conflicts:
	ChangeLog
	lib/VNDB/Handler/ULists.pm

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm
index d9974b00..0b5daa6c 100644
--- a/lib/VNDB/Handler/Discussions.pm
+++ b/lib/VNDB/Handler/Discussions.pm
@@ -48,7 +48,7 @@ sub thread {
    end;
   end;
 
-  $self->htmlBrowseNavigate("/t$tid/", $page, $t->{count} > $page*25, 't', 1);
+  $self->htmlBrowseNavigate("/t$tid/", $page, [ $t->{count}, 25 ], 't', 1);
   div class => 'mainbox thread';
    table;
     for my $i (0..$#$p) {
@@ -83,7 +83,7 @@ sub thread {
     }
    end;
   end;
-  $self->htmlBrowseNavigate("/t$tid/", $page, $t->{count} > $page*25, 'b', 1);
+  $self->htmlBrowseNavigate("/t$tid/", $page, [ $t->{count}, 25 ], 'b', 1);
 
   if($t->{locked}) {
     div class => 'mainbox';
@@ -278,7 +278,7 @@ sub board {
   return 404 if $f->{_err};
 
   my $obj = !$iid ? undef :
-    $type eq 'u' ? $self->dbUserGet(uid => $iid)->[0] :
+    $type eq 'u' ? $self->dbUserGet(uid => $iid, what => 'hide_list')->[0] :
     $type eq 'p' ? $self->dbProducerGet(id => $iid)->[0] :
                    $self->dbVNGet(id => $iid)->[0];
   return 404 if $iid && !$obj;