fix #8131 - chinese translations

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index f9b9156..54f83f5 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -80,17 +80,17 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         
         $this->selectAdd("
            (
-            SELECT COUNT(${cgm}.user_id) 
+            SELECT COUNT({$cgm}.user_id) 
                 FROM 
                     {$cgm}
                 LEFT JOIN
                     {$cp}
                 ON
-                    ${cp}.id = {$cgm}.user_id
+                    {$cp}.id = {$cgm}.user_id
                 WHERE
-                    ${cgm}.group_id = {$this->tableName()}.id
+                    {$cgm}.group_id = {$this->tableName()}.id
                 AND
-                    ${cp}.active = 1
+                    {$cp}.active = 1
                 ) AS group_member_count            
         ");
         
@@ -129,8 +129,18 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             $roo->jok('updated');
 
         }
+        if (isset($q['display_name']) && !isset($q['name']) && !$this->is_system) {
+            $this->name = $q['display_name'];
+        }
 
     }
+    
+    function beforeUpdate($old, $q,$roo)
+    {
+        if (isset($q['display_name']) && empty($q['name']) && !$this->is_system) {
+            $this->name = $q['display_name'];
+        }
+    }
 
 
     function beforeDelete()