Merge branch 'master' of github.com:diaspora/diaspora

app/models/post.rb

@@ -72,6 +72,7 @@ class Post < ActiveRecord::Base
 
   def raw_message; ""; end
   def mentioned_people; []; end
+  def photos; []; end
 
   def self.excluding_blocks(user)
     people = user.blocks.map{|b| b.person_id}

public/javascripts/app/templates/likes-info.handlebars

@@ -2,7 +2,7 @@
   <div class="comment">
     <div class="media">
       <span class="img">
-        <img alt="Heart" src="/images/icons/pin.png" />
+        <img alt="Heart" src="{{imageUrl "/images/icons/pin.png"}}" />
       </span>
 
       <div class="bd">

public/javascripts/app/templates/stream-element.handlebars

@@ -4,14 +4,14 @@
     <div class="controls">
       {{#if authorIsCurrentUser}}
         <a href="#" rel=nofollow>
-          <img src="/images/icons/ignoreuser.png" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" />
+          <img src="{{imageUrl "/images/icons/ignoreuser.png"}}"" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" />
         </a>
         <a href="#" rel=nofollow>
-          <img src="/images/deletelabel.png" class="delete control_icon hide_post" title="{{t "stream.hide"}}" />
+          <img src="{{imageUrl"/images/deletelabel.png"}}" class="delete control_icon hide_post" title="{{t "stream.hide"}}" />
         </a>
       {{else}}
         <a href="#" rel=nofollow>
-          <img src="/images/deletelabel.png" class="delete control_icon remove_post" title="{{t "delete"}}" />
+          <img src="{{imageUrl "/images/deletelabel.png"}}" class="delete control_icon remove_post" title="{{t "delete"}}" />
         </a>
       {{/if}}
     </div>