diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 9dcff29ba..f84d4b6d5 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -7,6 +7,6 @@ .content .from = link_to post.person.real_name, post.person - = post.text + = markdownify(post.text) %div.time = "#{time_ago_in_words(post.updated_at)} #{t('ago')}" diff --git a/public/javascripts/view.js b/public/javascripts/view.js index aa20805ba..7c81c7175 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -123,7 +123,7 @@ $(".make_profile_photo").live("click", function(){ $controls = $this.closest(".controls"), user_id = $controls.attr('data-actor'); person_id = $controls.attr('data-actor_person'); - photo_url = $controls(".controls").attr('data-image_url'); + photo_url = $controls.attr('data-image_url'); $.ajax({ type: "PUT",