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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-01-24 12:27:06 -06:00
parent 7a12cdb502 aea2c5099f
commit 61a52a91e1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -96,7 +96,7 @@ require 'stringsupport'
# Performs HTML escaping on text, but keeps linefeeds intact (by replacing them with <br/>) # Performs HTML escaping on text, but keeps linefeeds intact (by replacing them with <br/>)
def escape_preserving_linefeeds(text) def escape_preserving_linefeeds(text)
h(text).gsub(/\n/, '<br/>') h(text).gsub(/\n/, '<br/>').as_utf8
end end
def format_date(date, include_time = true) def format_date(date, include_time = true)

2
app/models/page.rb
View file

@ -108,7 +108,7 @@ class Page < ActiveRecord::Base
end end
def to_param def to_param
name name.as_utf8
end end
private private

4
app/models/wiki_reference.rb
View file

@ -78,7 +78,7 @@ class WikiReference < ActiveRecord::Base
"AND wiki_references.link_type = '#{REDIRECTED_PAGE}' " + "AND wiki_references.link_type = '#{REDIRECTED_PAGE}' " +
"AND pages.web_id = '#{web.id}'" "AND pages.web_id = '#{web.id}'"
row = connection.select_one(sanitize_sql([query, page_name])) row = connection.select_one(sanitize_sql([query, page_name]))
row['name'] if row row['name'].as_utf8 if row
end end
def self.pages_in_category(web, category) def self.pages_in_category(web, category)
@ -88,7 +88,7 @@ class WikiReference < ActiveRecord::Base
"WHERE wiki_references.referenced_name = ? " + "WHERE wiki_references.referenced_name = ? " +
"AND wiki_references.link_type = '#{CATEGORY}' " + "AND wiki_references.link_type = '#{CATEGORY}' " +
"AND pages.web_id = '#{web.id}'" "AND pages.web_id = '#{web.id}'"
names = connection.select_all(sanitize_sql([query, category])).map { |row| row['name'] } names = connection.select_all(sanitize_sql([query, category])).map { |row| row['name'].as_utf8 }
end end
def self.list_categories(web) def self.list_categories(web)