From 70f144d242da96f06a6385b191dc805cbb4dfc20 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Wed, 10 Apr 2013 05:34:36 +0000
Subject: [PATCH]  * finish task#1218.

---
 module/bug/control.php            | 1 +
 module/bug/view/sendmail.html.php | 2 +-
 module/common/view/mail.html.php  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index f2b2d048c8..28d541123f 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -905,6 +905,7 @@ class bug extends control
         if($action->action == 'opened') $action->comment = '';
         $this->view->bug    = $bug;
         $this->view->action = $action;
+        $this->view->users  = $this->user->getPairs('noletter|nodeleted');
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send it. */
diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php
index 5a8a16eb81..76d4fa0391 100644
--- a/module/bug/view/sendmail.html.php
+++ b/module/bug/view/sendmail.html.php
@@ -13,7 +13,7 @@
 <table width='98%' align='center'>
   <tr class='header'>
     <td>
-      BUG #<?php echo $bug->id . "=>$bug->assignedTo " . html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>
+      BUG #<?php echo $bug->id . "=>{$users[$bug->assignedTo]} " . html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>
     </td>
   </tr>
   <tr>
diff --git a/module/common/view/mail.html.php b/module/common/view/mail.html.php
index 854cdb1fc0..5de1105c67 100644
--- a/module/common/view/mail.html.php
+++ b/module/common/view/mail.html.php
@@ -1,5 +1,6 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 <?php if(isset($users[$action->actor])) $action->actor = $users[$action->actor];?>
+<?php if(isset($users[$action->extra])) $action->extra = $users[$action->extra];?>
 <span><?php $this->action->printAction($action);?>
 <?php if(!empty($action->comment) or !empty($action->history)):?>
 <div class='history'>