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 pull request #321 from justinmayer/siteurl

Browse source 
Replace omitted slash in feed URL generation
This commit is contained in:
Alexis Metaireau 2012-04-18 07:24:35 -07:00
commit f3188587ce
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/settings.py
View file

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

2
pelican/writers.py
View file

@ -36,7 +36,7 @@ class Writer(object):
feed.add_item( feed.add_item(
title=item.title, title=item.title,
link='%s%s' % (self.site_url, item.url), link='%s/%s' % (self.site_url, item.url),
unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''), unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
item.date.date(), item.url), item.date.date(), item.url),
description=item.content, description=item.content,