only skip active sticky entries when rendering RecentPage (#3470)

Author: kareila

cgi-bin/LJ/S2/RecentPage.pm

@@ -223,7 +223,7 @@ sub RecentPage {
 
     $opts->{cut_disable} = ( $remote && $remote->prop('opt_cut_disable_journal') );
 
-    my $sticky_entries = $u->sticky_entries_lookup;
+    my $sticky_entries = { map { $_ => 1 } $u->sticky_entry_active_ids };
 
 ENTRY:
     foreach my $item (@items) {

cgi-bin/LJ/User/Permissions.pm

@@ -1411,13 +1411,23 @@ sub sticky_entries {
     return @entries;
 }
 
-# returns a list of sticky entry ids
+# returns a list of all sticky entry ids
 sub sticky_entry_ids {
     my $prop = $_[0]->prop('sticky_entry');
     return unless defined $prop;
     return split /,/, $prop;
 }
 
+# returns a list of active sticky entry ids
+sub sticky_entry_active_ids {
+    my ($u) = @_;
+    my $max = $u->count_max_stickies || 0;
+    my @ids = $u->sticky_entry_ids;
+    return unless @ids;
+    @ids = @ids[ 0 .. $max - 1 ] if scalar @ids > $max;
+    return @ids;
+}
+
 # returns a map of ditemid => 1 of the sticky entries
 sub sticky_entries_lookup {
     return { map { $_ => 1 } $_[0]->sticky_entry_ids };