From 1cf45e97df880fb74734cab43c0e2d2e93db62d3 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 4 Jun 2015 16:27:38 +0800
Subject: [PATCH] DataObjects/Core_enum.php

---
 DataObjects/Core_enum.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 563de4b4..3ed13ebe 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -124,6 +124,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     function beforeUpdate($old, $request,$roo)
     {   
+        if(!empty($request['_merge_with'])){
+            
+        }
+        
         $tn = $this->tableName();
         $x = $this->factory($tn);
         if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
-- 
2.39.2