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

More Ruby 1.9 Encoding Fun

Browse source 
Under Ruby 1.9, could not delete orphan
pages with utf-8 names. They would be
listed as orphan, but "Delete Orphan Pages"
would silently not delete them.

Fixed.
This commit is contained in:
Jacques Distler 2010-01-24 12:23:47 -06:00
parent b9db67073d
commit aea2c5099f
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/wiki_reference.rb
View file

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