diff --git a/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm b/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm index 6ae529f..f9a05f2 100644 --- a/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm +++ b/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm @@ -116,30 +116,26 @@ sub getViewVars { my $var = $self->get; - my $issueCount = 0; - my ( @recentIssues, @olderIssues ); - my $issues = $self->getIssues; + my $recentCount = 0; + my @issues; + my $issues = $self->getIssues; foreach my $issue ( @{ $issues } ) { my $issueVar = $issue->get; $issueVar->{ url } = $issue->getUrl; - $issueCount++; + if ( $recentCount < $self->get('recentIssueCount') ) { + $issueVar->{ content } = $self->getAssetContent( $issue ); + $issueVar->{ isRecent } = 1; + $recentCount++; + } - if ( $issueCount <= $self->get('recentIssueCount') ) { - $issueVar->{ content } = $self->getAssetContent( $issue ); - - push @recentIssues, $issueVar; - } - else { - push @olderIssues, $issueVar; - } + push @issues, $issueVar; } - $var->{ recent_issue_loop } = \@recentIssues; - $var->{ recent_issue_count } = scalar @recentIssues; - $var->{ older_issue_loop } = \@olderIssues; - $var->{ older_issue_count } = scalar @olderIssues; - $var->{ issue_count } = $issueCount; + $var->{ recent_issue_count } = $recentCount; + $var->{ older_issue_count } = scalar( @issues ) - $recentCount; + $var->{ issue_loop } = \@issues; + $var->{ issue_count } = scalar @issues; $self->appendSubscriptionFormVars( $var ); diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg index 8a8f22c..6ba7a9d 100644 Binary files a/sbin/packages/root_import_personalnewsletter.wgpkg and b/sbin/packages/root_import_personalnewsletter.wgpkg differ