Fix help (one more time)

diff --git a/lib/rbot/core/basics.rb b/lib/rbot/core/basics.rb
index f6b07e01f2a6bc1b5e53ce17781947201f8d74b5..4c18037e15e236217cbb9dedc238c9fadbbcf257 100644 (file)
--- a/lib/rbot/core/basics.rb
+++ b/lib/rbot/core/basics.rb
@@ -90,8 +90,8 @@ class BasicsModule < CoreBotModule
   #   @bot.say m.replyto, @lang.get("hello_X") % m.sourcenick\r
 \r
   # handle help requests for "core" topics\r
-  def help(plugin, topic="")\r
-    case topic\r
+  def help(cmd, topic="")\r
+    case cmd\r
     when "quit"\r
       return "quit [<message>] => quit IRC with message <message>"\r
     when "restart"\r

diff --git a/lib/rbot/plugins.rb b/lib/rbot/plugins.rb
index 0dc8832461ce7334aa0479ce156271340ac2e2e0..8aa75d203f656790673b2abf4a9a826328e56c4e 100644 (file)
--- a/lib/rbot/plugins.rb
+++ b/lib/rbot/plugins.rb
@@ -533,7 +533,7 @@ module Plugins
         if commands.has_key?(k)
           p = commands[k][:botmodule] 
           begin
-            return p.help(p.name, topic)
+            return p.help(key, params)
           rescue Exception => err
             #rescue TimeoutError, StandardError, NameError, SyntaxError => err
             error report_error("#{p.botmodule_class} #{p.name} help() failed:", err)