fixes suggested by @Kwpolska

getnikola · Jun 6, 2017 · 43b24b2 · 43b24b2
1 parent de8d483
commit 43b24b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -962,9 +962,11 @@ def __init__(self, **config):
             self._GLOBAL_CONTEXT['transition'] = config.get('THEME_REVEAL_CONFIG_TRANSITION', 'cube')
 
         # The pelican metadata format requires a markdown extension
-        if config.get('METADATA_FORMAT', 'nikola').lower() == 'pelican':
-            if 'markdown.extensions.meta' not in config.get('MARKDOWN_EXTENSIONS', []):
-                utils.LOGGER.warn('To use the pelican metadata format you may need to add "markdown.extensions.meta" to your MARKDOWN_EXTENSIONS setting.')
+        if config.get('METADATA_FORMAT').lower() == 'pelican':
+            if 'markdown.extensions.meta' not in config.get('MARKDOWN_EXTENSIONS', []) \
+                    and 'markdown' in self.config['COMPILERS']:
+                utils.LOGGER.warn('To use the pelican metadata format you need to add '
+                '"markdown.extensions.meta" to your MARKDOWN_EXTENSIONS setting.')
 
         # We use one global tzinfo object all over Nikola.
         try:

diff --git a/nikola/plugins/compile/markdown/__init__.py b/nikola/plugins/compile/markdown/__init__.py
@@ -161,9 +161,9 @@ def read_metadata(self, post, file_metadata_regexp=None, unslugify_titles=False,
             # If the metadata starts with "---" it's actually YAML and
             # we should not let markdown parse it, because it will do
             # bad things like setting empty tags to "''"
-            if data.splitlines()[0] == '---':
+            if data.startswith('---\n'):
                 return {}
-            _, meta = self.converter.convert(inf.read())
+            _, meta = self.converter.convert(data)
         # Map metadata from other platforms to names Nikola expects (Issue #2817)
         map_metadata(meta, 'markdown_metadata', self.site.config)
         return meta