kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

When reading inline templates, don't set encoding 

for each line, but only once for the complete
file.
This commit is contained in:
Konstantin Haase 2010-12-13 13:56:53 +01:00
parent ff18f868a9
commit 8240bb7fbb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/sinatra/base.rb
View File

@ -930,13 +930,14 @@ module Sinatra
end end
lines = app.count("\n") + 1 lines = app.count("\n") + 1
template = nil template = nil
force_encoding data, encoding
data.each_line do |line| data.each_line do |line|
lines += 1 lines += 1
if line =~ /^@@\s*(.*\S)\s*$/ if line =~ /^@@\s*(.*\S)\s*$/
template = force_encoding('', encoding) template = force_encoding('', encoding)
templates[$1.to_sym] = [template, file, lines] templates[$1.to_sym] = [template, file, lines]
elsif template elsif template
template << force_encoding(line, encoding) template << line
end end
end end
end end