New Version
Sync with Latest Instiki Trunk. Migrate to Rails 1.2.5. Bump version number.
This commit is contained in:
parent
de125367b0
commit
207fb1f7f2
120 changed files with 2592 additions and 662 deletions
|
@ -52,8 +52,9 @@ module ActionController
|
|||
# Delete the unused options to prevent their appearance in the query string
|
||||
[:protocol, :host, :port].each { |k| options.delete k }
|
||||
end
|
||||
anchor = "##{options.delete(:anchor)}" if options.key?(:anchor)
|
||||
url << Routing::Routes.generate(options, {})
|
||||
return url
|
||||
return "#{url}#{anchor}"
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -76,6 +77,7 @@ module ActionController
|
|||
alias_method :to_s, :to_str
|
||||
|
||||
private
|
||||
# Given a path and options, returns a rewritten URL string
|
||||
def rewrite_url(path, options)
|
||||
rewritten_url = ""
|
||||
unless options[:only_path]
|
||||
|
@ -91,6 +93,7 @@ module ActionController
|
|||
rewritten_url
|
||||
end
|
||||
|
||||
# Given a Hash of options, generates a route
|
||||
def rewrite_path(options)
|
||||
options = options.symbolize_keys
|
||||
options.update(options[:params].symbolize_keys) if options[:params]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue