diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-29 18:52:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-29 18:52:42 -0400 |
| commit | 2ba168ac8357ad76de246d656b3da15bc9c0e722 (patch) | |
| tree | 59db9cde2101adc0bd17d77123734ffab9999429 | |
| parent | 2d45a303e253c4a20ce456a82e8ac694b49c2c2d (diff) | |
| download | ikiwiki-2ba168ac8357ad76de246d656b3da15bc9c0e722.tar ikiwiki-2ba168ac8357ad76de246d656b3da15bc9c0e722.tar.gz | |
use newpagefile
| -rw-r--r-- | IkiWiki/Plugin/editpage.pm | 7 | ||||
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index f44e4f857..794548c6d 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -156,12 +156,7 @@ sub cgi_editpage ($$) { #{{{ $type=pagetype($pagesources{$from}); } $type=$config{default_pageext} unless defined $type; - if (! $config{indexpages}) { - $file=$page.".".$type; - } - else { - $file=$page."/index.".$type; - } + $file=newpagefile($page, $type); if (! $form->submitted) { $form->field(name => "rcsinfo", value => "", force => 1); } diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index b2c3eedfe..218cab489 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -279,12 +279,7 @@ sub sessioncgi ($$) { #{{{ $type=$ext; } - if (! $config{indexpages}) { - $destfile.=".".$type; - } - else { - $destfile.="/index.".$type; - } + $destfile=newpagefile($dest, $type); } push @torename, { src => $src, |