projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41e2580
)
DataObjects/Core_group.php
author
Edward
<edward@roojs.com>
Fri, 14 Sep 2018 02:32:38 +0000
(10:32 +0800)
committer
Edward
<edward@roojs.com>
Fri, 14 Sep 2018 02:32:38 +0000
(10:32 +0800)
DataObjects/Core_group.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_group.php
b/DataObjects/Core_group.php
index
6f21315
..
7e76b1e
100644
(file)
--- 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(tru
e)){
- $g->
insert()
;
+
+ if(
empty($o) || empty($o->display_nam
e)){
+ $g->
display_name = $display_name
;
}
+
+ (empty($o)) ? $g->insert() : $g->update($o);
if(count($g->members()) || empty($gi['members'])){
continue;