--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -13,13 +13,16 @@
 
     @expose()
     @without_trailing_slash
-    def markdown_to_html(self, markdown, project=None, app=None):
+    def markdown_to_html(self, markdown, neighborhood=None, project=None, app=None):
         """Convert markdown to html."""
         if project:
+            if neighborhood:
+                n = M.Neighborhood.query.get(name=neighborhood)
+                project = M.Project.query.get(shortname=project, neighborhood_id=n._id)
             g.set_project(project)
             if app:
                 g.set_app(app)
-        html = g.markdown.convert(markdown)
+        html = g.markdown_wiki.convert(markdown)
         return html
 
     @expose()