* Various minor bug fixes for silly mistakes in the code, thanks to the

various reviewers.
master
joey 2007-07-28 21:01:56 +00:00
parent 80d4d1d26d
commit c0f8808232
3 changed files with 12 additions and 3 deletions

View File

@ -128,8 +128,8 @@ my $state_loaded=0;
sub loadstate () { #{{{ sub loadstate () { #{{{
return if $state_loaded; return if $state_loaded;
if (-e "$config{wikistatedir}/aggregate") { if (-e "$config{wikistatedir}/aggregate") {
open (IN, "$config{wikistatedir}/aggregate" || open(IN, "$config{wikistatedir}/aggregate") ||
die "$config{wikistatedir}/aggregate: $!"); die "$config{wikistatedir}/aggregate: $!";
while (<IN>) { while (<IN>) {
$_=IkiWiki::possibly_foolish_untaint($_); $_=IkiWiki::possibly_foolish_untaint($_);
chomp; chomp;

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ikiwiki (2.6) UNRELEASED; urgency=low
* Various minor bug fixes for silly mistakes in the code, thanks to the
various reviewers.
-- Joey Hess <joeyh@debian.org> Sat, 28 Jul 2007 17:01:35 -0400
ikiwiki (2.5) unstable; urgency=low ikiwiki (2.5) unstable; urgency=low
* Wrap the editpage template in the standard misctemplate, this allows the * Wrap the editpage template in the standard misctemplate, this allows the

View File

@ -4,4 +4,6 @@
It looks like the intent was "open this file, and die if you can't", It looks like the intent was "open this file, and die if you can't",
but I'm pretty sure it actually means "open this file and ignore errors but I'm pretty sure it actually means "open this file and ignore errors
silently". Shouldn't this be `open(IN, $file) || die "$file: $!";` silently". Shouldn't this be `open(IN, $file) || die "$file: $!";`
(i.e. with the parens before the call to `die`)? --Ethan (i.e. with the parens before the call to `die`)? --Ethan
> Thanks, [[done]] --[[Joey]]