Modified: trunk/app/controllers/pictures_controller.rb (2796 => 2797)
--- trunk/app/controllers/pictures_controller.rb 2011-11-09 20:07:26 UTC (rev 2796)
+++ trunk/app/controllers/pictures_controller.rb 2011-11-10 10:26:34 UTC (rev 2797)
@@ -6,8 +6,8 @@
class PicturesController < ApplicationController
before_filter :login_required, :except => [:index, :show]
- before_filter :find_user
- before_filter :find_picture, : [:show]
+ before_filter :find_user, :except => [:show]
+
before_filter :find_pictures, : [:index]
before_filter :find_picture_auth, : [:select, :edit, :update, :destroy]
@@ -60,7 +60,7 @@
send_cached_data("public/pictures/show/#{width.to_i}x#{height.to_i}/#{params[:id].to_i}.jpg",
:type => 'image/jpeg', :disposition => 'inline') {
-
+ find_picture
img = Magick::Image.from_blob(@picture.data).first
img = img.change_geometry("#{width}x#{height}>") do |c, r, i| i.resize(c, r) end