Bläddra i källkod

Merge pull request #819 from yomguy/master

jinja2content: Fix settings and extensions parsing proposed in #818
Justin Mayer 7 år sedan
förälder
incheckning
df8c9113f0
1 ändrade filer med 3 tillägg och 2 borttagningar
  1. 3 2
      jinja2content/jinja2content.py

+ 3 - 2
jinja2content/jinja2content.py

@@ -30,7 +30,7 @@ class JinjaMarkdownReader(MarkdownReader):
         loaders = [FileSystemLoader(_dir) for _dir
                    in local_dirs + [theme_dir]]
         if 'JINJA_ENVIRONMENT' in self.settings: # pelican 3.7
-            jinja_environment = self.setting['JINJA_ENVIRONMENT']
+            jinja_environment = self.settings['JINJA_ENVIRONMENT']
         else:
             jinja_environment = {
                 'trim_blocks': True,
@@ -47,8 +47,9 @@ class JinjaMarkdownReader(MarkdownReader):
         Rendering them as jinja templates first.
 
         """
+
         self._source_path = source_path
-        self._md = Markdown(extensions=self.extensions)
+        self._md = Markdown(extensions=self.settings['MARKDOWN']['extensions'])
 
         with pelican_open(source_path) as text:
             text = self.env.from_string(text).render()