github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/555'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
pelican/contents.py
View file

@ -53,11 +53,6 @@ class Page(object):
if not hasattr(self, 'author'):
if 'AUTHOR' in settings:
self.author = Author(settings['AUTHOR'], settings)
else:
title = filename.decode('utf-8') if filename else self.title
self.author = Author(getenv('USER', 'John Doe'), settings)
logger.warning(u"Author of `{0}' unknown, assuming that his name is "
"`{1}'".format(title, self.author))
# manage languages
self.in_default_lang = True
@ -120,7 +115,7 @@ class Page(object):
'slug': getattr(self, 'slug', ''),
'lang': getattr(self, 'lang', 'en'),
'date': getattr(self, 'date', datetime.now()),
'author': self.author,
'author': getattr(self, 'author', ''),
'category': getattr(self, 'category',
self.settings['DEFAULT_CATEGORY']),
}