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-04 18:46:00 -06:00
parent e417054a67 6cf1463525
commit 0cdbbbd9ff
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/wiki_controller.rb
View file

@ -389,6 +389,7 @@ class WikiController < ApplicationController
def load_page def load_page
@page_name = params['id'] ? params['id'].purify : nil @page_name = params['id'] ? params['id'].purify : nil
@page = @wiki.read_page(@web_name, @page_name) if @page_name @page = @wiki.read_page(@web_name, @page_name) if @page_name
@page.name.as_utf8 if @page
end end
private private

2
app/models/author.rb
View file

@ -3,7 +3,7 @@ class Author < String
attr_reader :name attr_reader :name
def initialize(name, ip = nil) def initialize(name, ip = nil)
@ip = ip @ip = ip
super(name) super(name.as_utf8)
end end
def name=(value) def name=(value)

2
app/models/page.rb
View file

@ -82,7 +82,7 @@ class Page < ActiveRecord::Base
# Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page". # Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
def plain_name def plain_name
web.brackets_only? ? CGI.escapeHTML(name).as_utf8 : CGI.escapeHTML(WikiWords.separate(name)).as_utf8 web.brackets_only? ? CGI.escapeHTML(name) : CGI.escapeHTML(WikiWords.separate(name))
end end
LOCKING_PERIOD = 30.minutes LOCKING_PERIOD = 30.minutes

4
test/functional/wiki_controller_test.rb
View file

@ -683,7 +683,9 @@ class WikiControllerTest < ActionController::TestCase
assert_match @eternity, r.headers["Set-Cookie"][0] assert_match @eternity, r.headers["Set-Cookie"][0]
new_page = @wiki.read_page('wiki1', 'NewPage') new_page = @wiki.read_page('wiki1', 'NewPage')
assert_equal "Double-struck A: \360\235\224\270", new_page.content assert_equal "Double-struck A: \360\235\224\270", new_page.content
assert_equal "\360\235\224\270\303\274thorOfNewPage", new_page.author a = ''.respond_to?(:force_encoding) ? "\u{1D538}\u00FCthorOfNewPage" :
"\360\235\224\270\303\274thorOfNewPage"
assert_equal a, new_page.author
assert_equal "\360\235\224\270\303\274thorOfNewPage", r.cookies['author'] assert_equal "\360\235\224\270\303\274thorOfNewPage", r.cookies['author']
end end