Changeset 14062

Show
Ignore:
Timestamp:
07/16/08 18:36:27 (5 years ago)
Author:
janine
Message:

LJSUP-2510

Writer's Block archive page should include questions for the user's defined country and questions for any country.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/cgi-bin/LJ/QotD.pm

    r13905 r14062  
    188188    my $u = shift; 
    189189    my $skip = shift; 
     190    my $all = shift; 
    190191    my @questions = @_; 
    191192 
    … …  
    222223    # targeted at their country, or if we're looking at the history, 
    223224    # return all questions 
    224     if (@questions_ret && $skip == 0) { 
     225    if (@questions_ret && $skip == 0 && !$all) { 
    225226        return @questions_ret; 
    226227    } else { 
    … …  
    256257    @questions = $class->filter_by_domain($u, $domain, @questions) unless $all; 
    257258    @questions = $class->filter_by_eff_class($u, @questions); 
    258     @questions = $class->filter_by_country($u, $skip, @questions); 
     259    @questions = $class->filter_by_country($u, $skip, $all, @questions); 
    259260 
    260261    # sort questions in descending order by start time (newest first)