From: edward <edward@roojs.com>
Date: Thu, 10 Nov 2016 08:43:56 +0000 (+0800)
Subject: Process/FixCode.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=520089811373deca3303cc6bd9cefcd1f9b29c25

Process/FixCode.php
---

diff --git a/Process/FixCode.php b/Process/FixCode.php
index 120360d3..a8b3cedf 100644
--- a/Process/FixCode.php
+++ b/Process/FixCode.php
@@ -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) {