lib/knj/objects.rb in knjrbfw-0.0.91 vs lib/knj/objects.rb in knjrbfw-0.0.92

@@ -164,11 +164,11 @@
       @callbacks[classstr].clone.each do |callback_key, callback|
         docall = false
         
         if callback.key?("signal") and args.key?("signal") and callback["signal"] == args["signal"]
           docall = true
-        elsif callback["signals"] and args["signal"] and callback["signals"].index(args["signal"]) != nil
+        elsif callback["signals"] and args["signal"] and callback["signals"].include?(args["signal"])
           docall = true
         end
         
         next if !docall
         
@@ -183,9 +183,10 @@
             raise "Unknown number of arguments: #{arity}"
           end
           
           callback["block"].call(*callargs)
         elsif callback["callback"]
+          require "php4r"
           Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."
         end
       end
\ No newline at end of file