svnno****@sourc*****
svnno****@sourc*****
2009年 9月 4日 (金) 00:25:01 JST
Revision: 1046
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1046
Author: okkez
Date: 2009-09-04 00:25:01 +0900 (Fri, 04 Sep 2009)
Log Message:
-----------
* hiki/command.rb (Hiki::Command): do not include Hiki::Util on top level.
* hiki/plugin.rb (Hiki::Plugin): include Hiki::Util instead of ERB::Util.
Modified Paths:
--------------
hiki/branches/rack/ChangeLog
hiki/branches/rack/hiki/command.rb
hiki/branches/rack/hiki/plugin.rb
Modified: hiki/branches/rack/ChangeLog
===================================================================
--- hiki/branches/rack/ChangeLog 2009-09-03 15:06:11 UTC (rev 1045)
+++ hiki/branches/rack/ChangeLog 2009-09-03 15:25:01 UTC (rev 1046)
@@ -1,3 +1,10 @@
+2009-09-03 okkez <okkez****@gmail*****>
+
+ * hiki/command.rb (Hiki::Command): do not include Hiki::Util on
+ top level.
+
+ * hiki/plugin.rb (Hiki::Plugin): include Hiki::Util instead of ERB::Util.
+
2009-08-31 okkez <okkez****@gmail*****>
* hiki/auth/typekey.rb: use literal instead of obvious new method.
Modified: hiki/branches/rack/hiki/command.rb
===================================================================
--- hiki/branches/rack/hiki/command.rb 2009-09-03 15:06:11 UTC (rev 1045)
+++ hiki/branches/rack/hiki/command.rb 2009-09-03 15:25:01 UTC (rev 1046)
@@ -10,8 +10,6 @@
require 'hiki/session'
require 'hiki/filter'
-include Hiki::Util
-
module Hiki
class PermissionError < StandardError; end
class SessionError < StandardError
@@ -22,6 +20,7 @@
end
class Command
+ include Hiki::Util
# TODO cgi -> request
def initialize(cgi, db, conf)
@db = db
Modified: hiki/branches/rack/hiki/plugin.rb
===================================================================
--- hiki/branches/rack/hiki/plugin.rb 2009-09-03 15:06:11 UTC (rev 1045)
+++ hiki/branches/rack/hiki/plugin.rb 2009-09-03 15:25:01 UTC (rev 1046)
@@ -13,7 +13,7 @@
class PluginError < StandardError; end
class Plugin
- include ERB::Util
+ include Hiki::Util
attr_reader :toc_f, :plugin_command
attr_accessor :text, :title, :cookies, :user, :data, :session_id