X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Process%2FFixDataObjectCtor.php;h=c5d89be479a9e84a5e5b76d65ba43f2b00a2abca;hb=443623f47935eb52acd65a3ff0d84eab1fd5a98b;hp=40ccde542c09bbe54857f9434382836d18e31051;hpb=64dc12426183d25f1942551a5554b73a1d4f6ead;p=Pman.Core

diff --git a/Process/FixDataObjectCtor.php b/Process/FixDataObjectCtor.php
index 40ccde54..c5d89be4 100644
--- a/Process/FixDataObjectCtor.php
+++ b/Process/FixDataObjectCtor.php
@@ -34,7 +34,7 @@ class Pman_Core_Process_FixDataObjectCtor extends Pman
     
     
     
-    function get($p,$opts)
+    function get($p,$opts=array())
     {
         $file = realpath($opts['file']);
         if (!file_exists($file) || !is_writable($file)) {
@@ -50,9 +50,18 @@ 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);
+        /// this one tends t hit a few odd comment examples..
+        //$c = preg_replace("/DataObjects_([a-z_]+)::/i", "DB_DataObject::factory('\\1')->", $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);
+        $c = preg_replace("/DB_DataObjects::factory/i", "DB_DataObject::factory", $c); // typo...
+
+        
+        
         if ($old_c == $c) {
             echo "$file: SKIP NO CHANGES\n";
             exit;