Merge branch 'master' of github.com:diaspora/diaspora

2010-11-25 16:29:00 -08:00 · 2010-11-25 16:29:00 -08:00 · e5673b304d
commit e5673b304d
parent 792690bb80 a2d3a940a6
1 changed files with 2 additions and 0 deletions
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@ -23,6 +23,8 @@ class AspectsController < ApplicationController
      flash[:notice] = I18n.t('aspects.create.success', :name => @aspect.name)
      if current_user.getting_started
        redirect_to :back
+      elsif request.env['HTTP_REFERER'].includes("aspects/manage")
+        redirect_to :back
      else
        respond_with @aspect
      end