mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
Fix as in dotclear, format is not "markdown" but "wiki". So add an "or" statement.
This commit is contained in:
parent
56749af1da
commit
f337f5067b
1 changed files with 2 additions and 2 deletions
|
|
@ -113,7 +113,7 @@ def dc2fields(file):
|
||||||
if cat_id:
|
if cat_id:
|
||||||
categories = [category_list[id].strip() for id in cat_id.split(',')]
|
categories = [category_list[id].strip() for id in cat_id.split(',')]
|
||||||
|
|
||||||
if post_format == "markdown":
|
if (post_format == "markdown") or (post_format == "wiki"):
|
||||||
content = post_excerpt + post_content
|
content = post_excerpt + post_content
|
||||||
else:
|
else:
|
||||||
content = post_excerpt_xhtml + post_content_xhtml
|
content = post_excerpt_xhtml + post_content_xhtml
|
||||||
|
|
@ -163,7 +163,7 @@ def build_markdown_header(title, date, author, categories, tags):
|
||||||
|
|
||||||
def fields2pelican(fields, output_path, dircat=False):
|
def fields2pelican(fields, output_path, dircat=False):
|
||||||
for title, content, filename, date, author, categories, tags, markup in fields:
|
for title, content, filename, date, author, categories, tags, markup in fields:
|
||||||
if markup == "markdown":
|
if (markup == "markdown") or (markup == "wiki"):
|
||||||
ext = '.md'
|
ext = '.md'
|
||||||
header = build_markdown_header(title, date, author, categories, tags)
|
header = build_markdown_header(title, date, author, categories, tags)
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue