From e586ed68c3abbbaacac449b13436774e46e62a12 Mon Sep 17 00:00:00 2001
From: Andrew Davidson <amdavidson@localhost.(none)>
Date: Fri, 30 Oct 2009 00:59:16 -0700
Subject: [PATCH] removing old remaining test code... whoops.

---
 app/controllers/flickr_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/flickr_controller.rb b/app/controllers/flickr_controller.rb
index 7f52ef1..7890aef 100644
--- a/app/controllers/flickr_controller.rb
+++ b/app/controllers/flickr_controller.rb
@@ -1,5 +1,5 @@
 class FlickrController < ApplicationController
-  FlickrawOptions = { :lazyload => true }
+  FlickrawOptions = { :lazyload => true, :timeout => 2 }
   require 'flickraw'
   @@flickr_id = "13827925@N00"
   
@@ -24,8 +24,6 @@ class FlickrController < ApplicationController
     @pid = flickr.photos.search(:user_id => @@flickr_id).rand.id
 	  @pinfo = flickr.photos.getInfo(:photo_id => @pid)
     @psize = flickr.photos.getSizes(:photo_id => @pid).find{|m| m.label == "Medium"}
-    flash[:error] = "Could not connect to Flickr."  
-    @pid = @pinfo = @psize = nil
 		    
     respond_to do |format|
       format.html