Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #9952: use_new_filter_convention_in_actionpack_internals.diff

File use_new_filter_convention_in_actionpack_internals.diff, 2.3 kB (added by josh, 1 year ago)
  • actionpack/test/controller/flash_test.rb

    old new  
    7070      flash["foo"] = "bar" 
    7171      redirect_to :action => "std_action" 
    7272      @flash_copy = {}.update(flash) 
    73       false 
    7473    end 
    7574  end 
    7675 
  • actionpack/lib/action_controller/http_authentication.rb

    old new  
    9393      end 
    9494 
    9595      def authenticate(controller, &login_procedure) 
    96         if authorization(controller.request).blank? 
    97           false 
    98         else 
     96        unless authorization(controller.request).blank? 
    9997          login_procedure.call(*user_name_and_password(controller.request)) 
    10098        end 
    10199      end 
     
    122120      def authentication_request(controller, realm) 
    123121        controller.headers["WWW-Authenticate"] = %(Basic realm="#{realm.gsub(/"/, "")}") 
    124122        controller.send! :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized 
    125         return false 
    126123      end 
    127124    end 
    128125  end 
  • actionpack/lib/action_controller/verification.rb

    old new  
    9898          options[:redirect_to] = self.send!(options[:redirect_to]) if options[:redirect_to].is_a? Symbol 
    9999          redirect_to(options[:redirect_to]) if options[:redirect_to] 
    100100        end 
    101         return false 
    102101      end 
    103  
    104       true 
    105102    end 
    106103    private :verify_action 
    107104  end 
  • actionpack/lib/action_controller/filters.rb

    old new  
    761761      def halt_filter_chain(filter, reason) 
    762762        @before_filter_chain_aborted = true 
    763763        logger.info "Filter chain halted as [#{filter.inspect}] #{reason}." if logger 
    764         false 
    765764      end 
    766765    end 
    767766  end