Skip to content
Permalink
Browse files

Merge pull request #1564 from getnikola/fix-xsl-path

fix #1563 -- fix rss.xsl path for subdir sites
  • Loading branch information
Kwpolska committed Jan 2, 2015
2 parents 82aab2a + baf9014 commit 6f1bd8a1766f93ece7c3a14e0c9b19124c97f742
Showing with 6 additions and 1 deletion.
  1. +2 −0 CHANGES.txt
  2. +2 −1 nikola/nikola.py
  3. +1 −0 nikola/plugins/task/rss.py
  4. +1 −0 nikola/plugins/task/tags.py
@@ -63,6 +63,8 @@ Features
Bugfixes
--------

* Fixed ``rss.xsl`` path for blogs not deployed to server root
(Issue #1563)
* Respect SHOW_UNTRANSLATED_POSTS = False in archives
and for untranslated source files (Issue #1360)
* Make sure drafts don’t appear in sitemaps with multiple languages
@@ -1017,7 +1017,8 @@ def generic_rss_renderer(self, lang, title, link, description, timeline, output_
)

if feed_url:
rss_obj.xsl_stylesheet_href = self.url_replacer(feed_url, "/assets/xml/rss.xsl")
absurl = '/' + feed_url[len(self.config['BASE_URL']):]
rss_obj.xsl_stylesheet_href = self.url_replacer(absurl, "/assets/xml/rss.xsl")

items = []

@@ -51,6 +51,7 @@ def gen_tasks(self):
"filters": self.site.config["FILTERS"],
"blog_title": self.site.config["BLOG_TITLE"],
"site_url": self.site.config["SITE_URL"],
"base_url": self.site.config["BASE_URL"],
"blog_description": self.site.config["BLOG_DESCRIPTION"],
"output_folder": self.site.config["OUTPUT_FOLDER"],
"rss_teasers": self.site.config["RSS_TEASERS"],
@@ -58,6 +58,7 @@ def gen_tasks(self):
"translations": self.site.config["TRANSLATIONS"],
"blog_title": self.site.config["BLOG_TITLE"],
"site_url": self.site.config["SITE_URL"],
"base_url": self.site.config["BASE_URL"],
"messages": self.site.MESSAGES,
"output_folder": self.site.config['OUTPUT_FOLDER'],
"filters": self.site.config['FILTERS'],

0 comments on commit 6f1bd8a

Please sign in to comment.
You can’t perform that action at this time.