Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 1855a8b48720baece395eeb06b4f2e1f84d701e4..9c7a8dbb7e79a2ac5865219ec02eb6dabe37a74d 100644 (file)
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -69,7 +69,7 @@ package IkiWiki::PageSpec;
 
 sub match_maxsize ($$;@) { #{{{
        my $page=shift;
-       my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
+       my $maxsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};
        if ($@) {
                return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
        }
@@ -90,7 +90,7 @@ sub match_maxsize ($$;@) { #{{{
 
 sub match_minsize ($$;@) { #{{{
        my $page=shift;
-       my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
+       my $minsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};
        if ($@) {
                return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
        }

diff --git a/debian/changelog b/debian/changelog
index 5d2a7d6d1296aaa520010f676f3719a9e474b75a..f1265ebec382dd91683e063338666906e4e3a726 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.63) UNRELEASED; urgency=low
+
+  * filecheck: Fixed two bits broken in move from attachment.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Aug 2008 13:04:15 -0400
+
 ikiwiki (2.62) unstable; urgency=low
 
   * Avoid using cp -a (again). (HenrikBrixAndersen)