Update Rails, rails_xss and Bundler
Update Bundler to 1.0.15. Update Rails to 2.3.12. Update rails_xss plugin. The latter two were the source of a considerable amount of grief, as rails_xss is now MUCH stricter about what string methods can be used. Also made it possible to use rake 0.9.x with Instiki. But you probably REALLY want to use ruby bundle exec rake ... instead of just saying rake ....
This commit is contained in:
parent
ec443685a6
commit
9e909d5be3
1105 changed files with 14278 additions and 4667 deletions
|
@ -208,7 +208,8 @@ class WikiContent < ActiveSupport::SafeBuffer
|
|||
@options[:engine].apply_to(self)
|
||||
as_utf8
|
||||
# unmask in one go. $~[1] is the chunk id
|
||||
gsub!(MASK_RE[ACTIVE_CHUNKS]) do
|
||||
text = self.to_str
|
||||
text.gsub!(MASK_RE[ACTIVE_CHUNKS]) do
|
||||
chunk = @chunks_by_id[$~[1].to_i]
|
||||
if chunk.nil?
|
||||
# if we match a chunkmask that existed in the original content string
|
||||
|
@ -218,7 +219,7 @@ class WikiContent < ActiveSupport::SafeBuffer
|
|||
chunk.unmask_text
|
||||
end
|
||||
end
|
||||
self.replace xhtml_sanitize(self)
|
||||
self.replace xhtml_sanitize(text)
|
||||
self.html_safe
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue