deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove last vestige of CGI.unescapeHTML

Browse source
This commit is contained in:
Jacques Distler 2009-01-10 02:00:26 -06:00
parent b6fbf039f4
commit 5c20871ec4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/url_generator.rb
View file

@ -1,3 +1,5 @@
require 'stringsupport'
class AbstractUrlGenerator class AbstractUrlGenerator
def initialize(controller) def initialize(controller)
@ -17,14 +19,14 @@ class AbstractUrlGenerator
else else
known_page = web.has_file?(name) known_page = web.has_file?(name)
description = web.description(name) description = web.description(name)
description = CGI.escapeHTML(CGI.unescapeHTML(description)) if description description = description.unescapeHTML.escapeHTML if description
end end
if (text == name) if (text == name)
text = description || text text = description || text
else else
text = text || description text = text || description
end end
text = CGI.escapeHTML(CGI.unescapeHTML(text || WikiWords.separate(name))) text = (text || WikiWords.separate(name)).unescapeHTML.escapeHTML
case link_type case link_type
when :show when :show