More tiny fixes

lib/devise/failure_app.rb

@@ -40,7 +40,7 @@ module Devise
 
     def recall
       env["PATH_INFO"]  = attempted_path
-      flash.now[:alert] = i18n_message(warden_options[:message] || :invalid)
+      flash.now[:alert] = i18n_message(:invalid)
       self.response = recall_app(warden_options[:recall]).call(env)
     end
 

lib/devise/hooks/activatable.rb

@@ -5,7 +5,6 @@
 Warden::Manager.after_set_user do |record, warden, options|
   if record && record.respond_to?(:active?) && !record.active?
     warden.logout(options[:scope])
-    options.merge!(:message => record.inactive_message)
-    throw :warden, options
+    throw :warden, options.merge(:message => record.inactive_message)
   end
 end

lib/devise/hooks/timeoutable.rb

@@ -13,7 +13,7 @@ Warden::Manager.after_set_user do |record, warden, options|
       path_checker = Devise::PathChecker.new(warden.env, scope)
       unless path_checker.signing_out?
         warden.logout(scope)
-        throw :warden, :scope => scope, :message => :timeout
+        throw :warden, options.merge(:message => :timeout)
       end
     end