weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Merge branch 'master' of https://github.com/ametaireau/pelican

Browse source
This commit is contained in:
Meir Kriheli 2012-04-28 00:52:45 +03:00
commit b73d984ec9
11 changed files with 81 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/settings.py
View file

@ -132,7 +132,7 @@ def configure_settings(settings, default_settings=None, filename=None):
if ('SITEURL' in settings):
# If SITEURL has a trailing slash, remove it and provide a warning
siteurl = settings['SITEURL']
if (siteurl[len(siteurl) - 1:] == '/'):
if (siteurl.endswith('/')):
settings['SITEURL'] = siteurl[:-1]
logger.warn("Removed extraneous trailing slash from SITEURL.")
# If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL