Don't rescue from User::DestroyWithOrdersError if it is not defined. F…

…ixes spree#1155
jsqu99 · Feb 20, 2012 · 3a6f5d3 · 3a6f5d3
1 parent e44aa27
commit 3a6f5d3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/app/controllers/spree/admin/users_controller.rb b/core/app/controllers/spree/admin/users_controller.rb
@@ -1,7 +1,9 @@
 module Spree
   module Admin
     class UsersController < ResourceController
-      rescue_from User::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
+      if User.const_defined?(DestroyWithOrdersError)
+        rescue_from User::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
+      end
 
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_filter :check_json_authenticity, :only => :index