From 6bb9f701f306c7a7e4e345b37155a403af87bcc5 Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Fri, 20 Jul 2018 14:31:43 +0800
Subject: [PATCH] sync

---
 DataObjects/Core_email.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 729ec249..96ec985a 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -388,13 +388,16 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }
-
+        
         if (!empty($contents['subject_replace'])) {
+            
+            // do not use the mapping 
             if (isset($contents['mapping'])) {
                 foreach ($contents['mapping'] as $pattern => $replace) {
                     $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
                 }
             }
+            
             foreach ($contents as $k => $v) {
                 if (is_string($v)) {
                     $contents['subject'] = str_replace('{'. $k . '}', $v, $contents['subject']);
@@ -415,11 +418,8 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         }
          
         require_once 'Pman/Core/Mailer.php';
-              
         
         $templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
-        //print_r($this);
-        
         
         $cfg = array(
             'template'=> $this->tableName() . '-' . $this->id,
-- 
2.39.2