Don't use yinxiang by default; fix bad merge in editor

Author: jeffkowalski

geeknote/config.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-ALWAYS_USE_YINXIANG = True
+ALWAYS_USE_YINXIANG = False  # for 印象笔记 (Yìnxiàng bǐjì), set to True
 
 # !!! DO NOT EDIT !!! >>>
 if ALWAYS_USE_YINXIANG or os.getenv("GEEKNOTE_BASE") == "yinxiang":

geeknote/editor.py

@@ -221,14 +221,11 @@ def textToENML(content, raise_ex=False, format='markdown', rawmd=False):
                 contentHTML = u''.join(('<pre>', content, '</pre>')).encode("utf-8")
             elif format == 'markdown':
                 # Markdown format https://daringfireball.net/projects/markdown/basics
-                storage = Storage()
-                extras = storage.getUserprop('markdown2_extras')
-
-                if not rawmd:
-                storage = Storage()
-                extras = storage.getUserprop('markdown2_extras')
+                extras = None
 
                 if not rawmd:
+                    storage = Storage()
+                    extras = storage.getUserprop('markdown2_extras')
                     content = Editor.HTMLEscapeTag(content)
 
                 contentHTML = markdown.markdown(content, extras=extras)