urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop abusing titlepage for internal encoding (esp since it doesn't work)

master
joey 2006-07-30 06:55:33 +00:00
parent b0885a7278
commit b220a11008
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/aggregate.pm
View File

@ -107,6 +107,8 @@ sub delete (@) { #{{{
} #}}} } #}}}
sub loadstate () { #{{{ sub loadstate () { #{{{
eval q{use HTML::Entities};
die $@ if $@;
if (-e "$IkiWiki::config{wikistatedir}/aggregate") { if (-e "$IkiWiki::config{wikistatedir}/aggregate") {
open (IN, "$IkiWiki::config{wikistatedir}/aggregate" || open (IN, "$IkiWiki::config{wikistatedir}/aggregate" ||
die "$IkiWiki::config{wikistatedir}/aggregate: $!"); die "$IkiWiki::config{wikistatedir}/aggregate: $!");
@ -118,7 +120,7 @@ sub loadstate () { #{{{
my ($field, $val)=split(/=/, $i, 2); my ($field, $val)=split(/=/, $i, 2);
if ($field eq "name" || $field eq "feed" || if ($field eq "name" || $field eq "feed" ||
$field eq "guid" || $field eq "message") { $field eq "guid" || $field eq "message") {
$data->{$field}=IkiWiki::pagetitle($val); $data->{$field}=decode_entities($val, " \t\n");
} }
elsif ($field eq "tag") { elsif ($field eq "tag") {
push @{$data->{tags}}, $val; push @{$data->{tags}}, $val;
@ -141,6 +143,8 @@ sub loadstate () { #{{{
} #}}} } #}}}
sub savestate () { #{{{ sub savestate () { #{{{
eval q{use HTML::Entities};
die $@ if $@;
open (OUT, ">$IkiWiki::config{wikistatedir}/aggregate" || open (OUT, ">$IkiWiki::config{wikistatedir}/aggregate" ||
die "$IkiWiki::config{wikistatedir}/aggregate: $!"); die "$IkiWiki::config{wikistatedir}/aggregate: $!");
foreach my $data (values %feeds, values %guids) { foreach my $data (values %feeds, values %guids) {
@ -162,7 +166,7 @@ sub savestate () { #{{{
foreach my $field (keys %$data) { foreach my $field (keys %$data) {
if ($field eq "name" || $field eq "feed" || if ($field eq "name" || $field eq "feed" ||
$field eq "guid" || $field eq "message") { $field eq "guid" || $field eq "message") {
push @line, "$field=".IkiWiki::titlepage($data->{$field}); push @line, "$field=".encode_entities($data->{$field}, " \t\n");
} }
elsif ($field eq "tags") { elsif ($field eq "tags") {
push @line, "tag=$_" foreach @{$data->{tags}}; push @line, "tag=$_" foreach @{$data->{tags}};