@@ -332,21 +332,21 @@ module WillPaginate
return url if page_one
if complex
- @url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, '\1@')
+ @url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, "\\1\0")
return url
else
@url_string = url
@url_params[param_name] = 3
@template.url_for(@url_params).split(//).each_with_index do |char, i|
if char == '3' and url[i, 1] == '2'
- @url_string[i] = '@'
+ @url_string[i] = "\0"
break
end
end
end
end
# finally!
- @url_string.sub '@', page.to_s
+ @url_string.sub "\0", page.to_s
end
private
lib/will_paginate/view_helpers.rb
@@ -277,6 +277,14 @@ class ViewTest < WillPaginate::ViewTestCase
end
end
end
+
+ def test_will_paginate_with_atmark_url
+ @request.symbolized_path_parameters[:action] = "@tag"
+ renderer = WillPaginate::LinkRenderer.new
+
+ paginate({ :page => 1 }, :renderer=>renderer)
+ assert_links_match %r[/foo/@tag\?page=\d]
+ end
def test_complex_custom_page_param
@request.params :developers => { :page => 2 }
test/view_test.rb
b63e438094990aa1e6660614235009876c037801
KURODA Hiraku
hiraku.github@hinet.mydns.jp
http://github.com/mislav/will_paginate/commit/1142ac97a05be124895c93eb43b2f8932b722770
1142ac97a05be124895c93eb43b2f8932b722770
2009-05-20T04:12:42-07:00
2009-05-11T00:58:29-07:00
fix generation of page URLs that contain the "@" character
before, "/blogs/@Andrex/page/2" would be generated like "/blogs/2Andrex/page/@"
[#262 state:resolved]
104fa48a4256e2b4bf810d949a7ecb113eef7429
Mislav Marohnić
mislav.marohnic@gmail.com