From 910603aa1eb66f723fbb949b8708e2080ac4b196 Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Wed, 10 Jan 2018 12:11:21 +0800
Subject: [PATCH] DataObjects/Core_email.php

---
 DataObjects/Core_email.php | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index ffb8f5d5..c0fa7430 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -306,6 +306,29 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $p = new PEAR();
         $contents = (array)$obj;
 
+        if(!empty($obj['rcpts_gp'])) {
+            $rcpts = $obj['rcpts_gp'];
+            if (strpos($obj['rcpts_gp'], '@') == false) {
+                $rcpts = array();
+                $gp = DB_DataObject::factory('core_group');
+                $gp->get('name', $obj['rcpts_gp']);
+                foreach ($gp->members() as $v) {
+                    $rcpts[] = $v->email;
+                }
+                $content['rcpts'] = $rcpts;
+            }
+        }
+        
+        if (!empty($obj['is_subject_replace'])) {
+            $mapping = array(
+                '/{person.name}/' => $obj['person']->name
+            );
+            $subject = $obj['subject'];
+            foreach ($mapping as $pattern => $replace) {
+                $subject = preg_replace($pattern,$replace,$subject);
+            }
+            $content['subject'] = $subject;
+        }
          
         if(empty($this->id) && !empty($contents['template'])){
             $this->get('name', $contents['template']);
@@ -417,30 +440,6 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             return $this->toMailerData($obj,$force);
         }
         
-        if(!empty($obj['rcpts_gp'])) {
-            $rcpts = $obj['rcpts_gp'];
-            if (strpos($obj['rcpts_gp'], '@') == false) {
-                $rcpts = array();
-                $gp = DB_DataObject::factory('core_group');
-                $gp->get('name', $obj['rcpts_gp']);
-                foreach ($gp->members() as $v) {
-                    $rcpts[] = $v->email;
-                }
-                $obj['rcpts'] = $rcpts;
-            }
-        }
-        
-        if (!empty($obj['is_subject_replace'])) {
-            $mapping = array(
-                '/{person.name}/' => $obj['person']->name
-            );
-            $subject = $obj['subject'];
-            foreach ($mapping as $pattern => $replace) {
-                $subject = preg_replace($pattern,$replace,$subject);
-            }
-            $obj['subject'] = $subject;
-        }
-        
         $r = $this->toMailer($obj, $force);
         
         if (is_a($r, 'PEAR_Error')) {
-- 
2.39.2