remove leading dot from default_pageext
fix preview to not assume it's the default page type, and instead get the type from the pagemaster
parent
7b87549558
commit
f877845353
|
@ -16,7 +16,7 @@ sub defaultconfig () { #{{{
|
||||||
wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
|
wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
|
||||||
verbose => 0,
|
verbose => 0,
|
||||||
wikiname => "wiki",
|
wikiname => "wiki",
|
||||||
default_pageext => ".mdwn",
|
default_pageext => "mdwn",
|
||||||
cgi => 0,
|
cgi => 0,
|
||||||
rcs => 'svn',
|
rcs => 'svn',
|
||||||
notify => 0,
|
notify => 0,
|
||||||
|
|
|
@ -317,10 +317,13 @@ sub cgi_editpage ($$) { #{{{
|
||||||
}
|
}
|
||||||
$page=lc($page);
|
$page=lc($page);
|
||||||
|
|
||||||
my $file=$page.$config{default_pageext};
|
my $file;
|
||||||
if (exists $pagesources{lc($page)}) {
|
if (exists $pagesources{lc($page)}) {
|
||||||
$file=$pagesources{lc($page)};
|
$file=$pagesources{lc($page)};
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$file=$page.".".$config{default_pageext};
|
||||||
|
}
|
||||||
my $newfile=0;
|
my $newfile=0;
|
||||||
if (! -e "$config{srcdir}/$file") {
|
if (! -e "$config{srcdir}/$file") {
|
||||||
$newfile=1;
|
$newfile=1;
|
||||||
|
@ -360,7 +363,7 @@ sub cgi_editpage ($$) { #{{{
|
||||||
$form->field(name => "comments",
|
$form->field(name => "comments",
|
||||||
value => $comments, force => 1);
|
value => $comments, force => 1);
|
||||||
$form->tmpl_param("page_preview",
|
$form->tmpl_param("page_preview",
|
||||||
htmlize($config{default_pageext},
|
htmlize(pagetype($file),
|
||||||
linkify($page, $page, $content)));
|
linkify($page, $page, $content)));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue