X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Process%2FFixCode.php;h=d4adbf7347ec0e34091c5758ac924c2d43874106;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hp=120360d33c8c22a17668b7e1dcb53fa5d63697b7;hpb=5c74f0e07ccf316de994b46fafb20b69c1176213;p=Pman.Core

diff --git a/Process/FixCode.php b/Process/FixCode.php
index 120360d3..d4adbf73 100644
--- a/Process/FixCode.php
+++ b/Process/FixCode.php
@@ -55,7 +55,7 @@ class Pman_Core_Process_FixCode extends Pman
             
     );
     
-    function get($p,$opts)
+    function get($p,$opts=array())
     {
         $file = realpath($opts['file']);
         if (!file_exists($file) || !is_writable($file)) {
@@ -71,11 +71,10 @@ class Pman_Core_Process_FixCode extends Pman
         }
         foreach($this->factory_map as $from=>$to) {
             
-            preg_replace("/DB_DataObject::factory\(([\'\"]" . $from . "[\'\"]])\)/", "DB_DataObject::factory('$1')", $c);
-
+            $c = preg_replace("/DB_DataObject::factory\((\s{0,}['\"]" . $from . "['\"]\s{0,})\)/i", "DB_DataObject::factory('{$to}')", $c);
             
-            $c = str_ireplace("DB_DataObject::factory('$from')","DB_DataObject::factory('$to')", $c);
-            $c = str_ireplace("DB_DataObject::factory(\"$from\")","DB_DataObject::factory('$to')", $c);
+//            $c = str_ireplace("DB_DataObject::factory('$from')","DB_DataObject::factory('$to')", $c);
+//            $c = str_ireplace("DB_DataObject::factory(\"$from\")","DB_DataObject::factory('$to')", $c);
             
         }
         if ($old_c == $c) {