diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
| commit | 78c0744077b58fb4c20a965fdbbb52055922d793 (patch) | |
| tree | 8ba6033b3f7d8e19c78f59dca2db8ee97872647c /mediagoblin/templates | |
| parent | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.lz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.xz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.zip | |
Merge remote-tracking branch 'origin/master' into is315
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 200f13cd..44bc38b8 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -25,7 +25,9 @@ </h1> <img class="media_image" src="{{ request.app.public_store.file_url( media.media_files.main) }}" /> - <p>{{ media.description }}</p> + {% autoescape False %} + <p>{{ media.description_html }}</p> + {% endautoescape %} <p>Uploaded on {{ "%4d-%02d-%02d"|format(media.created.year, media.created.month, media.created.day) }} |