objects.rb in knjrbfw-0.0.74

- old
+ new

@@ -39,11 +39,11 @@
       Dir.foreach(@args[:class_path]) do |file|
         next if file == "." or file == ".." or !file.match(/\.rb$/)
         file_parsed = file
         file_parsed.gsub!(@args[:class_pre], "") if @args.key?(:class_pre)
         file_parsed.gsub!(/\.rb$/, "")
-        file_parsed = Knj::Php.ucwords(file_parsed)
+        file_parsed = Php4r.ucwords(file_parsed)
         
         loads << file_parsed
         self.requireclass(file_parsed, {:load => false})
       end
       
@@ -184,11 +184,11 @@
             raise "Unknown number of arguments: #{arity}"
           end
           
           callback["block"].call(*callargs)
         elsif callback["callback"]
-          Knj::Php.call_user_func(callback["callback"], args)
+          Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."
         end
       end
     end
@@ -401,11 +401,11 @@
   end
   
   def get_try(obj, col_name, obj_name = nil)
     if !obj_name
       if match = col_name.to_s.match(/^(.+)_id$/)
-        obj_name = Knj::Php.ucwords(match[1]).to_sym
+        obj_name = Php4r.ucwords(match[1]).to_sym
       else
         raise "Could not figure out objectname for: #{col_name}."
       end
     end
     
@@ -555,10 +555,10 @@
       list_args = args[:list_args]
     else
       list_args = {}
     end
     
-    if RUBY_VERSION[0..2] == 1.8 and Knj::Php.class_exists("Dictionary")
+    if RUBY_VERSION[0..2] == 1.8 and Php4r.class_exists("Dictionary")
       list = Dictionary.new
     else
       list = {}
     end
     
\ No newline at end of file