Merge remote branch 'upstream/develop-next' into develop-next

include/class.thread.php

@@ -301,6 +301,11 @@ implements Searchable {
 
             return false;
             break;
+        case $to instanceof Team:
+            //Referred to a Team
+            return ($this->getReferral($to->getId(),
+                        ObjectModel::OBJECT_TYPE_TEAM));
+            break;
         case $to instanceof Dept:
             // Refered to the dept
             return ($this->getReferral($to->getId(),
@@ -314,7 +319,7 @@ implements Searchable {
     function refer($to) {
 
         if ($this->isReferred($to, true))
-            return true;
+            return false;
 
         $vars = array('thread_id' => $this->getId());
         switch (true) {

include/class.ticket.php

@@ -2916,6 +2916,22 @@ implements RestrictedAccess, Threadable, Searchable {
         if (isset($vars['ccs']) && count($vars['ccs']))
             $this->addCollaborators($vars['ccs'], array(), $errors);
 
+        if ($collabs = $this->getCollaborators()) {
+            foreach ($collabs as $collaborator) {
+                $cid = $collaborator->getUserId();
+                // Enable collaborators if they were reselected
+                if (!$collaborator->isActive() && ($vars['ccs'] && in_array($cid, $vars['ccs'])))
+                    $collaborator->setFlag(Collaborator::FLAG_ACTIVE, true);
+                // Disable collaborators if they were unchecked
+                elseif ($collaborator->isActive() && (!$vars['ccs'] || !in_array($cid, $vars['ccs'])))
+                    $collaborator->setFlag(Collaborator::FLAG_ACTIVE, false);
+
+                $collaborator->save();
+            }
+        }
+        // clear db cache
+        $this->getThread()->_collaborators = null;
+
         // Get active recipients of the response
         $recipients = $this->getRecipients($vars['reply-to'], $vars['ccs']);
         if ($recipients instanceof MailingList)