diff options
| author | Joey Hess <joey@kitenet.net> | 2013-07-10 18:23:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-10 18:23:09 -0400 |
| commit | 87f46582f518e48d3875864bfc490a52be739520 (patch) | |
| tree | 89d0f5960b37aa8e4f077974c85165cea2aead5a | |
| parent | 9710d989781038b58a71ec2aebb25f85faa92b53 (diff) | |
| download | ikiwiki-87f46582f518e48d3875864bfc490a52be739520.tar ikiwiki-87f46582f518e48d3875864bfc490a52be739520.tar.gz | |
Fix committing attachments when using svn.
| -rw-r--r-- | IkiWiki/Plugin/attachment.pm | 12 | ||||
| -rw-r--r-- | doc/bugs/Attachment_plug-in_not_committing_files.mdwn | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index aea70429d..83dd120f6 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -274,15 +274,15 @@ sub attachments_save { foreach my $filename (glob("$dir/*")) { $filename=Encode::decode_utf8($filename); next unless -f $filename; - my $destdir=$config{srcdir}."/". - linkpage(IkiWiki::possibly_foolish_untaint( - attachment_location($form->field('page')))); + my $destdir=linkpage(IkiWiki::possibly_foolish_untaint( + attachment_location($form->field('page')))); + my $absdestdir=$config{srcdir}."/".$destdir; my $destfile=IkiWiki::basename($filename); - my $dest=$destdir.$destfile; + my $dest=$absdestdir.$destfile; unlink($dest); - IkiWiki::prep_writefile($destfile, $destdir); + IkiWiki::prep_writefile($destfile, $absdestdir); rename($filename, $dest); - push @attachments, $dest; + push @attachments, $destdir.$destfile; } return unless @attachments; require IkiWiki::Render; diff --git a/doc/bugs/Attachment_plug-in_not_committing_files.mdwn b/doc/bugs/Attachment_plug-in_not_committing_files.mdwn index 05db1f86e..aaba13326 100644 --- a/doc/bugs/Attachment_plug-in_not_committing_files.mdwn +++ b/doc/bugs/Attachment_plug-in_not_committing_files.mdwn @@ -10,3 +10,9 @@ From this code it looks like $dest needs to be absolute and that a relative path push @attachments, $dest; I'm using ikiwiki version 3.20120202ubuntu1. + +> I don't think this affects git, just because it happens to +> allow adding with an absolute path. +> +> So, this is an interesting way svn support can bit rot if nothing +> is testing it! [[fixed|done]] --[[Joey]] |