allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [1/2] git commit: [#5538] ticket:253 invalid artifact links as plain text in Preview
Date Mon, 28 Jan 2013 22:07:39 GMT
[#5538] ticket:253 invalid artifact links as plain text in Preview


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/578a4739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/578a4739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/578a4739

Branch: refs/heads/master
Commit: 578a4739ea1e74820178edd6fca0149a23c913b4
Parents: d636fbc
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Tue Jan 22 23:51:14 2013 +0400
Committer: Cory Johns <johnsca@geek.net>
Committed: Mon Jan 28 22:07:19 2013 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/static.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/578a4739/Allura/allura/controllers/static.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/static.py b/Allura/allura/controllers/static.py
index 4052bc9..0ddd3e0 100644
--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -18,5 +18,9 @@ class NewForgeController(object):
         if neighborhood is None or project is None:
             raise exc.HTTPBadRequest()
         h.set_context(project, app, neighborhood=neighborhood)
-        html = g.markdown_wiki.convert(markdown)
+
+        if app == 'wiki':
+            html = g.markdown_wiki.convert(markdown)
+        else:
+            html = g.markdown.convert(markdown)
         return html


Mime
View raw message