From 6bc44f6f5af9c90fd557c4e8e7c95997a16b2a3c Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Fri, 10 Feb 2012 13:44:45 -0800
Subject: [PATCH 1/2] add more images to use handlebars imageUrl helper

---
 public/javascripts/app/templates/likes-info.handlebars     | 2 +-
 public/javascripts/app/templates/stream-element.handlebars | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/javascripts/app/templates/likes-info.handlebars b/public/javascripts/app/templates/likes-info.handlebars
index fc93be6de..48d3c4f04 100644
--- a/public/javascripts/app/templates/likes-info.handlebars
+++ b/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">
diff --git a/public/javascripts/app/templates/stream-element.handlebars b/public/javascripts/app/templates/stream-element.handlebars
index 2d1afcd96..21b53dcea 100644
--- a/public/javascripts/app/templates/stream-element.handlebars
+++ b/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>

From 232e6206373ef3bd19f450dc965402eed6210a6b Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Fri, 10 Feb 2012 13:45:41 -0800
Subject: [PATCH 2/2] make posts have empty photos so reshared stop messing up

---
 app/models/post.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/post.rb b/app/models/post.rb
index 769e3522d..93ed6fe38 100644
--- a/app/models/post.rb
+++ b/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}