Changeset 370

Show
Ignore:
Timestamp:
12/09/06 16:04:51 (6 years ago)
Author:
nick
Message:

Do the store fetching properly, when getting the encoding for the feeds

Location:
wiki-toolkit/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/Atom.pm

    r369 r370  
    4949  # Supply some defaults, if a blank string isn't what we want 
    5050  unless($self->{encoding}) { 
    51     $self->{encoding} = $self->{wiki}->{store}->{_charset}; 
     51    $self->{encoding} = $self->{wiki}->store->{_charset}; 
    5252  } 
    5353 

  • wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/RSS.pm

    r369 r370  
    5050    # Supply some defaults, if a blank string isn't what we want 
    5151    unless($self->{encoding}) { 
    52         $self->{encoding} = $self->{wiki}->{store}->{_charset}; 
     52        $self->{encoding} = $self->{wiki}->store->{_charset}; 
    5353    } 
    5454 

  • wiki-toolkit/trunk/t/297_feed_rss_recentchanges.t

    r369 r370  
    6565            "change importance included and defaults to 'major'" ); 
    6666 
     67      my $charset = $wiki->store->{_charset}; 
    6768      like( $feed, qr|<?xml version="1.0"|, "is xml" ); 
    68       like( $feed, qr|<?xml version="1.0" encoding="$wiki->{store}->{_charset}"|, "is xml" ); 
     69      like( $feed, qr|<?xml version="1.0" encoding="$charset"|, "is xml" ); 
    6970 
    7071      # Check stuff that comes from the metadata. 

  • wiki-toolkit/trunk/t/302_feed_atom_recentchanges.t

    r369 r370  
    6868            "contains categories" ); 
    6969 
     70      my $charset = $wiki->store->{_charset}; 
    7071      like( $feed, qr|<?xml version="1.0"|, "is xml" ); 
    71       like( $feed, qr|<?xml version="1.0" encoding="$wiki->{store}->{_charset}"|, "is xml" ); 
     72      like( $feed, qr|<?xml version="1.0" encoding="$charset"|, "is xml" ); 
    7273 
    7374      # Test the 'items' parameter.