svnno****@sourc*****
svnno****@sourc*****
2009年 9月 10日 (木) 23:02:23 JST
Revision: 1062
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1062
Author: okkez
Date: 2009-09-10 23:02:23 +0900 (Thu, 10 Sep 2009)
Log Message:
-----------
do not require cgi.rb when using rack
Modified Paths:
--------------
hiki/branches/rack/hiki/page.rb
hiki/branches/rack/hiki/pluginutil.rb
hiki/branches/rack/misc/plugin/history.rb
Modified: hiki/branches/rack/hiki/page.rb
===================================================================
--- hiki/branches/rack/hiki/page.rb 2009-09-10 14:02:21 UTC (rev 1061)
+++ hiki/branches/rack/hiki/page.rb 2009-09-10 14:02:23 UTC (rev 1062)
@@ -2,7 +2,7 @@
# Copyright (C) 2002-2004 TAKEUCHI Hitoshi <hitos****@namar*****>
# Copyright (C) 2004-2005 Kazuhiko <kazuh****@fdiar*****>
-require 'cgi'
+require 'cgi' unless Object.const_defined?(:Rack)
require 'nkf'
module Hiki
Modified: hiki/branches/rack/hiki/pluginutil.rb
===================================================================
--- hiki/branches/rack/hiki/pluginutil.rb 2009-09-10 14:02:21 UTC (rev 1061)
+++ hiki/branches/rack/hiki/pluginutil.rb 2009-09-10 14:02:23 UTC (rev 1062)
@@ -10,7 +10,7 @@
#
# Based on shellwords.rb(in ruby standard library).
-require 'cgi'
+require 'cgi' unless Object.const_defined?(:Rack)
require 'erb'
module Hiki
Modified: hiki/branches/rack/misc/plugin/history.rb
===================================================================
--- hiki/branches/rack/misc/plugin/history.rb 2009-09-10 14:02:21 UTC (rev 1061)
+++ hiki/branches/rack/misc/plugin/history.rb 2009-09-10 14:02:23 UTC (rev 1062)
@@ -98,7 +98,7 @@
tokens = parser.parse( s )
formatter =****@conf*****( tokens, @db, @plugin, @conf )
@page = Page.new( @cgi, @conf )
- data = Util.get_common_data( @db, @plugin, @conf )
+ data = get_common_data( @db, @plugin, @conf )
@plugin.hiki_menu(data, @cmd)
pg_title =****@plugi*****_name(@p)
data[:title] = title( "#{pg_title} - #{history_label}")