From: Edward Date: Fri, 14 Sep 2018 02:32:38 +0000 (+0800) Subject: DataObjects/Core_group.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=18bab08fbca633d9258be294aafeba1d86eec3eb DataObjects/Core_group.php --- diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php index 6f213154..7e76b1ed 100644 --- a/DataObjects/Core_group.php +++ b/DataObjects/Core_group.php @@ -344,11 +344,17 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject $o = clone($g); } + $display_name = (isset($gi['display_name'])) ? $gi['display_name'] : ''; + + unset($gi['display_name']); + $g->setFrom($gi); - - if(!$g->find(true)){ - $g->insert(); + + if(empty($o) || empty($o->display_name)){ + $g->display_name = $display_name; } + + (empty($o)) ? $g->insert() : $g->update($o); if(count($g->members()) || empty($gi['members'])){ continue;