Skip to content

Commit

Permalink
Merge branch 'justinlove-master'
Browse files Browse the repository at this point in the history
Conflicts:
	lib/openid/store/filesystem.rb
  • Loading branch information
courtenay committed Feb 23, 2012
2 parents 4aaff96 + a6c14b6 commit 663fc45
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/openid/store/filesystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ def filename_escape(s)
if @@FILENAME_ALLOWED.index(c)
filename_chunks << c
else
filename_chunks << sprintf("_%02X", c.bytes.first)
n = c.respond_to?(:ord) ? c.ord : c[0]
filename_chunks << sprintf("_%02X", n)
end
end
filename_chunks.join("")
Expand Down

0 comments on commit 663fc45

Please sign in to comment.