diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
| commit | 0692c01e4c7b88ce94fe023607109fb978c36c2e (patch) | |
| tree | c906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /mediagoblin/templates | |
| parent | 079868489479550d9d8190cde6109cc39cd6272c (diff) | |
| parent | 44e51d3464e719e596e1480b7af2957742a9085b (diff) | |
| download | mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.lz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.xz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.zip | |
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts:
setup.py
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) }} |