From dae9f6540bb1fb3a2b1fe987093bc3ad0d2087fc Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 25 Oct 2010 00:47:21 -0700
Subject: [PATCH] adding case for error message being emmited

---
 app/controllers/requests_controller.rb | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index a6dac609e..3cd8a4960 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -46,7 +46,6 @@ class RequestsController < ApplicationController
 
         begin
           @request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
-          
         rescue Exception => e
           Rails.logger.debug("error: #{e.message}")
           flash[:error] = e.message
@@ -55,16 +54,12 @@ class RequestsController < ApplicationController
         #socket to tell people this failed?
       end
       }
-    rescue Exception => e 
-      flash[:error] = e.message
-    end
-    
-    if params[:getting_started]
-      redirect_to getting_started_path(:step=>params[:getting_started])
-    else
-      flash[:notice] = "we tried our best to send a message to #{account}" unless flash[:error]
-      respond_with :location => aspects_manage_path 
-      return
-    end    
+      rescue Exception => e 
+        flash[:error] = e.message
+      end
+
+
+    flash[:notice] = "we tried our best to send a message to #{account}" unless flash[:error]
+    redirect_to aspects_manage_path
   end
 end