]> sipb.mit.edu Git - ikiwiki.git/commitdiff
fix the other half of the filecheck filename bug
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:16:21 +0000 (00:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:16:21 +0000 (00:16 -0400)
IkiWiki/Plugin/remove.pm
IkiWiki/Plugin/rename.pm
debian/changelog
doc/bugs/filecheck_failing_to_find_files.mdwn

index f59d0269e4cc747da68db81b56afd82cdc304cee..0fc180f699ce0b2071067404bf3845b2a60b3a9e 100644 (file)
@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
        # This is sorta overkill, but better safe than sorry.
        if (! defined pagetype($pagesources{$page})) {
                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-                       IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+                       IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
                }
                else {
                        error("removal of attachments is not allowed");
index 3908443cabd720bdd644d37c1ebbc8731b1b1035..1a9da6363165c3ef06cffd1855e9520926c310a2 100644 (file)
@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
        IkiWiki::check_canedit($src, $q, $session);
        if ($attachment) {
                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-                       IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
+                       IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
                }
                else {
                        error("renaming of attachments is not allowed");
@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
                if ($attachment) {
                        # Note that $srcfile is used here, not $destfile,
                        # because it wants the current file, to check it.
-                       IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
+                       IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
                }
        }
 
index 7249cdfa49c9a2e9839efb53df9a7c300e2c926a..da1ab890e4c92ed3ac96a18f551e30cc3813c26e 100644 (file)
@@ -15,7 +15,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
-  * filecheck: Fix bug that prevented the pagespecs from matching when
+  * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
index f8d8e83e67755330cfb107e7a08e0bd69572beff..6501508e47afc879f665320a39292826333f34ea 100644 (file)
@@ -25,6 +25,8 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 
 >>>>>> Yes, it works! --[[KathrynAndersen]]
 
+applied && [[done]]
+
 <pre>
 diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
 index f59d026..0fc180f 100644