Merge branch 'feature/task-revamp' into develop-next

Conflicts:
	include/class.thread_actions.php

include/class.thread_actions.php

@@ -135,7 +135,7 @@ class TEA_EditThreadEntry extends ThreadEntryAction {
                 && $T->getDept()->getManagerId() == $thisstaff->getId()
             )
             || ($T instanceof Ticket
-                && ($role = $T->getRole($thisstaff))
+                && ($role = $thisstaff->getRole($T->getDeptId(), $T->isAssigned($thisstaff)))
                 && $role->hasPerm(ThreadEntry::PERM_EDIT)
             )
         );