Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 10, 2011
Showing with 2 additions and 3 deletions.
  1. +1 −2 app/models/radius_tags.rb
  2. +1 −1 app/models/tag_search_page.rb
@@ -304,8 +304,7 @@ def find_with_tag_options(tag)
raise TagError, "`tagged' tag must contain a `with' attribute." unless (tag.attr['with'] || tag.locals.page.class_name = TagSearchPage)
ttag = tag.attr['with'] || @request.parameters[:tag]
- scope_path = scope_attr == 'current_page' ? @request.request_uri : scope_attr
- scope = Page.find_by_path scope_path
+ scope = scope_attr == 'current_page' ? Page.find_by_url(@request.request_uri) : Page.find_by_url(scope_attr)
return "The scope attribute must be a valid url to an existing page." if scope.nil? || scope.class_name.eql?('FileNotFoundPage')
if with_any
@@ -95,7 +95,7 @@ def render
super
end
- def find_by_path(url, live = true, clean = false)
+ def find_by_url(url, live = true, clean = false)
url = clean_url(url).chop # chop off trailing slash added by clean_url
if url =~ /^#{self.url}([a-zA-Z0-9,\_\-\s\/()'.&]*)\/?$/
self.requested_tag = $1

No commit comments for this range