asd

solidusio · Nov 8, 2019 · 71d13fb · 71d13fb
1 parent 3d05489
commit 71d13fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/core/app/models/spree/user_last_url_storer.rb b/core/app/models/spree/user_last_url_storer.rb
@@ -5,14 +5,6 @@ module Spree
   # into `session[:spree_user_return_to]` for redirects after successful
   # user/admin authentication.
   class UserLastUrlStorer
-    class Configuration
-      def rules
-        @rules ||= ::Spree::Core::ClassConstantizer::Set.new.tap do |set|
-          set << 'Spree::UserLastUrlStorer::Rules::AuthenticationRule'
-        end
-      end
-    end
-
     # Lists all the rules that will be evaluated before storing the
     # current path value into the session.
     #
@@ -27,7 +19,7 @@ def rules
     #  Spree::UserLastUrlStorer.rules.delete('CustomRule')
     #
     def self.rules
-      Spree::Config.user_last_url_storer.rules
+      Spree::Config.user_last_url_storer_rules
     end
 
     # @param controller [ApplicationController] an instance of ApplicationController

diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
@@ -474,8 +474,10 @@ def events
       @events_configuration ||= Spree::Event::Configuration.new
     end
 
-    def user_last_url_storer
-      @user_last_url_storer_configuration ||= Spree::UserLastUrlStorer::Configuration.new
+    def user_last_url_storer_rules
+      @user_last_url_storer_rules ||= ::Spree::Core::ClassConstantizer::Set.new.tap do |set|
+        set << 'Spree::UserLastUrlStorer::Rules::AuthenticationRule'
+      end
     end
 
     def environment