Changeset 4936

Show
Ignore:
Timestamp:
11/26/07 15:04:47 (1 year ago)
Author:
uta
Message:

rails_protection

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/rails_protection/trunk/rails_protection/lib/custom_sanitizer_rules/tiny_mce.rb

    r4510 r4936  
    66    :target         => /\A_self|_blank\z/mn, 
    77    :title          => /.+/mn, 
     8    :type           => /.+/mn, 
    89    :id             => /.+/mn, 
    910  }, 

  • plugins/rails_protection/trunk/rails_protection/lib/rails_protection_for_csrf.rb

    r4665 r4936  
    1414        if block_given? 
    1515          content = hidden_field_tag('rails_protection_session_id', session.session_id) + capture(&block) 
    16           concat(form_tag_original(*args), block.binding) 
     16          concat(rails_protection_form_tag_original(*args), block.binding) 
    1717          concat(content, block.binding) 
    1818          concat("</form>", block.binding) 
    1919        else 
    20           form_tag_original(*args) + hidden_field_tag('rails_protection_session_id', session.session_id) 
     20          rails_protection_form_tag_original(*args) + hidden_field_tag('rails_protection_session_id', session.session_id) 
    2121        end 
    2222      end 
    …… 
    7070 
    7171::ActionView::Helpers::FormTagHelper.class_eval do 
    72   alias :form_tag_original :form_tag 
     72  alias :rails_protection_form_tag_original :form_tag unless method_defined?(:rails_protection_form_tag_original) 
    7373end 
    7474::ActionView::Base.send(:include, RailsProtection::Csrf::ActionViewMethods)