Process/FixDataObjectCtor.php

[Pman.Core] / Process / FixDataObjectCtor.php

diff --git a/Process/FixDataObjectCtor.php b/Process/FixDataObjectCtor.php
index b3333ee..91e5947 100644 (file)
--- a/Process/FixDataObjectCtor.php
+++ b/Process/FixDataObjectCtor.php
@@ -50,10 +50,13 @@ class Pman_Core_Process_FixDataObjectCtor extends Pman
         }
         $c = preg_replace("/new DataObjects_([a-z_]+)/i", "DB_DataObject::factory('\\1')", $c);
         
-        $c = preg_replace("/DataObjects_([a-z_]+)::/i", "DB_DataObject::factory('\\1')::", $c);
+        $c = preg_replace("/DataObjects_([a-z_]+)::/i", "DB_DataObject::factory('\\1')->", $c);
         
-        $c = preg_replace("/DB_DataObjects::staticGet\(\"DataObjects_([a-z_]+)\"/i", "DB_DataObject::factory('\\1')->load(", $c);
-        $c = preg_replace("/DB_DataObjects::staticGet\('DataObjects_([a-z_]+)'/i", "DB_DataObject::factory('\\1')->load(", $c);
+        $c = preg_replace("/DB_DataObject::staticGet\(\"DataObjects_([a-z_]+)\"\s*,/i", "DB_DataObject::factory('\\1')->load(", $c);
+        $c = preg_replace("/DB_DataObject::staticGet\('DataObjects_([a-z_]+)'\s*,/i", "DB_DataObject::factory('\\1')->load(", $c);
+
+      
+        $c = preg_replace("/DB_DataObject::factory\('([a-z_]+)'\)::/i", "DB_DataObject::factory('\\1')->", $c);
 
       
         if ($old_c == $c) {