From 409d07ae2b111d70c1d60159260fa8b345d607fb Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Wed, 20 Nov 2013 14:48:52 +0800
Subject: [PATCH]  * fix bug #543.

---
 module/bug/model.php  | 14 --------------
 module/task/model.php |  7 -------
 2 files changed, 21 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index d0f388d69e..83ea1a278d 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -168,14 +168,6 @@ class bugModel extends model
         if($setImgSize) $bug->steps = $this->loadModel('file')->setImgSize($bug->steps);
         foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $bug->$key = '';
 
-        if($bug->mailto)
-        {
-            $bug->mailto = ltrim(trim($bug->mailto), ',');  // Remove the first ,
-            $bug->mailto = str_replace(' ', '', $bug->mailto);
-            $bug->mailto = rtrim($bug->mailto, ',') . ',';
-            $bug->mailto = str_replace(',', ', ', $bug->mailto);
-        }
-
         if($bug->duplicateBug) $bug->duplicateBugTitle = $this->dao->findById($bug->duplicateBug)->from(TABLE_BUG)->fields('title')->fetch('title');
         if($bug->case)         $bug->caseTitle         = $this->dao->findById($bug->case)->from(TABLE_CASE)->fields('title')->fetch('title');
         if($bug->linkBug)      $bug->linkBugTitles     = $this->dao->select('id,title')->from(TABLE_BUG)->where('id')->in($bug->linkBug)->fetchPairs();
@@ -261,12 +253,6 @@ class bugModel extends model
             ->where('id')->eq((int)$bugID)
             ->exec();
 
-        /* format mailto. */
-        $bug->mailto = ltrim(trim($bug->mailto), ',');
-        $bug->mailto = str_replace(' ','', $bug->mailto);
-        $bug->mailto = rtrim($bug->mailto, ',') . ',';
-        $bug->mailto = str_replace(',', ', ', $bug->mailto);
-
         if(!dao::isError()) return common::createChanges($oldBug, $bug);
     }
 
diff --git a/module/task/model.php b/module/task/model.php
index 7ae08dc95e..eb44ed9b67 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -663,13 +663,6 @@ class taskModel extends model
         if($setImgSize) $task->desc = $this->loadModel('file')->setImgSize($task->desc);
         if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed';
         foreach($task as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $task->$key = '';
-        if($task->mailto)
-        {
-            $task->mailto = ltrim(trim($task->mailto), ',');  // remove the first ,
-            $task->mailto = str_replace(' ', '', $task->mailto);
-            $task->mailto = rtrim($task->mailto, ',') . ',';
-            $task->mailto = str_replace(',', ', ', $task->mailto);
-        }
         $task->files = $this->loadModel('file')->getByObject('task', $taskID);
         return $this->processTask($task);
     }