Modified: trunk/app/controllers/pictures_controller.rb (2795 => 2796)
--- trunk/app/controllers/pictures_controller.rb 2011-11-09 14:57:00 UTC (rev 2795)
+++ trunk/app/controllers/pictures_controller.rb 2011-11-09 20:07:26 UTC (rev 2796)
@@ -126,7 +126,7 @@
end
def find_user
- @user = User.find(params[:user_id])
+ @user = User.find_by_id(params[:user_id])
end
private
Modified: trunk/app/views/pictures/index.rhtml (2795 => 2796)
--- trunk/app/views/pictures/index.rhtml 2011-11-09 14:57:00 UTC (rev 2795)
+++ trunk/app/views/pictures/index.rhtml 2011-11-09 20:07:26 UTC (rev 2796)
@@ -27,7 +27,7 @@
<%= image_tag avatar_url(picture.id, 100), :class => 'framed' %>
</td>
<td class="actions">
- <% if my_page? picture.user %>
+ <% if my_page? picture.owner %>
<% unless picture.selected? %>
<%= icon "picture", select_user_picture_path(picture.user_id, picture), nil, nil, "Make Profile Pic" %>
<% end %>