From 66e5d7f47ab4e7ded5769996ed101b076027eddf Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:36:22 +0800
Subject: [PATCH]  * fix bug #1313.

---
 module/task/control.php | 4 +++-
 module/task/model.php   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 869c42b8a6..88e7440f4c 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -779,6 +779,7 @@ class task extends control
         $task    = $this->view->task;
         $members = $this->loadModel('user')->getPairs('noletter');
 
+        $this->view->users = $members;
         if(!empty($task->team))
         {
             $task->openedBy   = $this->task->getNextUser(array_keys($task->team), $task->assignedTo);
@@ -789,7 +790,7 @@ class task extends control
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;
         $this->view->position[] = $this->lang->task->finish;
         $this->view->members    = $members;
-       
+
         $this->display();
     }
 
@@ -822,6 +823,7 @@ class task extends control
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->pause;
         $this->view->position[] = $this->lang->task->pause;
         
+        $this->view->users = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
 
diff --git a/module/task/model.php b/module/task/model.php
index 257e7da219..515580428f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1129,7 +1129,7 @@ class taskModel extends model
         if(!empty($task->parent)) $task->parentName = $this->dao->findById($task->parent)->from(TABLE_TASK)->fetch('name');
 
         $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->eq($taskID)->orderBy('order_desc')->fetchGroup('task', 'account');
-        foreach($teams as $key => $team) $teams[$key] = array_reverse($team);
+        foreach($teams as $key => $team) $teams[$key] = array_reverse($team, true);
         $task->team = isset($teams[$taskID]) ? $teams[$taskID] : array();
         foreach($children as $child) $child->team = isset($teams[$child->id]) ? $teams[$child->id] : array();