Merge branch 'pr/555'

Conflicts:
	pelican/contents.py
This commit is contained in:
Bruno Binet 2012-11-13 01:23:31 +01:00
commit c787e02dcc
4 changed files with 10 additions and 10 deletions

View file

@ -43,7 +43,7 @@ class Writer(object):
item.date.date(), item.url),
description=item.content,
categories=item.tags if hasattr(item, 'tags') else None,
author_name=getattr(item, 'author', 'John Doe'),
author_name=getattr(item, 'author', ''),
pubdate=set_date_tzinfo(item.date,
self.settings.get('TIMEZONE', None)))