浏览代码

Allow utilization of place holder in from and reply_to fields for action emails

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2254 a333f486-631f-4898-b8df-5754b55c2be0
etaloc 12 年之前
父节点
当前提交
58e4f5c090
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      core/action.class.inc.php

+ 3 - 3
core/action.class.inc.php

@@ -288,8 +288,8 @@ class ActionEmail extends ActionNotification
 			$sCC = $this->FindRecipients('cc', $aContextArgs);
 			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
 	
-			$sFrom = $this->Get('from');
-			$sReplyTo = $this->Get('reply_to');
+			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
+			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
 	
 			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
@@ -392,4 +392,4 @@ class ActionEmail extends ActionNotification
 		}
 	}
 }
-?>
+?>