Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian

2010-12-26 21:43:23 +01:00 · 2010-12-26 21:43:23 +01:00 · f92eb1735f
commit f92eb1735f
parent b348f094ab 89ce11456a
1 changed files with 1 additions and 1 deletions
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@ -52,7 +52,7 @@

    - if @photo.status_message_id
      %p
-        = @photo.status_message.message
+        = markdownify(@photo.status_message.message)

      %p
        - for photo in @additional_photos