Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46356EF02 for ; Mon, 28 Jan 2013 22:07:40 +0000 (UTC) Received: (qmail 63007 invoked by uid 500); 28 Jan 2013 22:07:40 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 62989 invoked by uid 500); 28 Jan 2013 22:07:40 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 62980 invoked by uid 99); 28 Jan 2013 22:07:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 22:07:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C71EA826859; Mon, 28 Jan 2013 22:07:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [#5538] ticket:253 invalid artifact links as plain text in Preview Message-Id: <20130128220739.C71EA826859@tyr.zones.apache.org> Date: Mon, 28 Jan 2013 22:07:39 +0000 (UTC) [#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 Authored: Tue Jan 22 23:51:14 2013 +0400 Committer: Cory Johns 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