From 61e63ef9e012d494864d4a0f0341a8aa2b49c5d6 Mon Sep 17 00:00:00 2001
From: Tomas Dittmann <chaosmeist3r@gmail.com>
Date: Sat, 5 Feb 2022 05:59:33 +0100
Subject: [PATCH] Remove `project_id` from task URLs

---
 app/Controller/CommentController.php          | 15 +++-----
 app/Controller/CommentMailController.php      |  6 +--
 .../ExternalTaskCreationController.php        |  2 +-
 app/Controller/SubtaskController.php          | 10 ++---
 app/Controller/SubtaskConverterController.php |  5 +--
 .../SubtaskRestrictionController.php          |  2 +-
 app/Controller/TaskDuplicationController.php  |  6 +--
 app/Controller/TaskExternalLinkController.php |  6 +--
 app/Controller/TaskFileController.php         |  6 +--
 app/Controller/TaskInternalLinkController.php |  6 +--
 app/Controller/TaskMailController.php         |  6 +--
 app/Controller/TaskModificationController.php |  6 +--
 app/Controller/TaskMovePositionController.php |  2 +-
 app/Controller/TaskRecurrenceController.php   |  2 +-
 app/Controller/TaskStatusController.php       |  2 +-
 app/Controller/TaskViewController.php         |  2 +-
 .../SubtaskTimeTrackingCalendarFormatter.php  |  2 +-
 app/Formatter/TaskApiFormatter.php            |  2 +-
 app/Formatter/TaskICalFormatter.php           |  2 +-
 app/Helper/SubtaskHelper.php                  |  4 +-
 app/ServiceProvider/RouteProvider.php         | 10 ++---
 app/Template/analytic/time_comparison.php     |  4 +-
 app/Template/board/task_avatar.php            |  2 +-
 app/Template/board/task_footer.php            | 18 ++++-----
 app/Template/board/task_private.php           | 10 ++---
 app/Template/board/tooltip_files.php          |  8 ++--
 app/Template/comment/create.php               |  4 +-
 app/Template/comment/edit.php                 |  2 +-
 app/Template/comment/remove.php               |  2 +-
 app/Template/comment/show.php                 |  6 +--
 app/Template/comment_list/create.php          |  2 +-
 app/Template/comment_list/show.php            |  4 +-
 app/Template/comment_mail/create.php          |  2 +-
 app/Template/event/comment_create.php         |  2 +-
 app/Template/event/comment_delete.php         |  2 +-
 app/Template/event/comment_update.php         |  2 +-
 app/Template/event/subtask_create.php         |  2 +-
 app/Template/event/subtask_delete.php         |  2 +-
 app/Template/event/subtask_update.php         |  2 +-
 app/Template/event/task_assignee_change.php   |  4 +-
 app/Template/event/task_close.php             |  2 +-
 app/Template/event/task_create.php            |  2 +-
 app/Template/event/task_file_create.php       |  2 +-
 app/Template/event/task_file_destroy.php      |  2 +-
 .../task_internal_link_create_update.php      |  2 +-
 .../event/task_internal_link_delete.php       |  2 +-
 app/Template/event/task_move_column.php       |  2 +-
 app/Template/event/task_move_position.php     |  2 +-
 app/Template/event/task_move_swimlane.php     |  4 +-
 app/Template/event/task_open.php              |  2 +-
 app/Template/event/task_update.php            |  2 +-
 app/Template/notification/footer.php          |  2 +-
 app/Template/notification/task_overdue.php    |  2 +-
 app/Template/project_user_overview/tasks.php  |  4 +-
 app/Template/subtask/create.php               |  4 +-
 app/Template/subtask/edit.php                 |  2 +-
 app/Template/subtask/menu.php                 |  6 +--
 app/Template/subtask/remove.php               |  2 +-
 app/Template/subtask/table.php                |  2 +-
 app/Template/subtask_converter/show.php       |  2 +-
 app/Template/subtask_restriction/show.php     |  2 +-
 app/Template/task/details.php                 |  6 +--
 app/Template/task/dropdown.php                | 28 +++++++-------
 app/Template/task/layout.php                  |  8 ++--
 app/Template/task/sidebar.php                 | 38 +++++++++----------
 app/Template/task_comments/create.php         |  2 +-
 app/Template/task_comments/show.php           |  4 +-
 app/Template/task_duplication/copy.php        |  6 +--
 app/Template/task_duplication/duplicate.php   |  2 +-
 app/Template/task_duplication/move.php        |  6 +--
 app/Template/task_external_link/create.php    |  2 +-
 app/Template/task_external_link/edit.php      |  2 +-
 app/Template/task_external_link/find.php      |  2 +-
 app/Template/task_external_link/remove.php    |  2 +-
 app/Template/task_external_link/table.php     |  4 +-
 app/Template/task_file/create.php             |  2 +-
 app/Template/task_file/files.php              |  8 ++--
 app/Template/task_file/images.php             | 12 +++---
 app/Template/task_file/remove.php             |  2 +-
 app/Template/task_file/screenshot.php         |  2 +-
 app/Template/task_internal_link/create.php    |  2 +-
 app/Template/task_internal_link/edit.php      |  2 +-
 app/Template/task_internal_link/remove.php    |  2 +-
 app/Template/task_internal_link/table.php     |  4 +-
 app/Template/task_list/task_avatars.php       |  2 +-
 app/Template/task_list/task_details.php       |  2 +-
 app/Template/task_list/task_icons.php         | 16 ++++----
 app/Template/task_list/task_title.php         |  2 +-
 app/Template/task_mail/create.php             |  2 +-
 app/Template/task_modification/show.php       |  2 +-
 app/Template/task_move_position/show.php      |  2 +-
 app/Template/task_recurrence/edit.php         |  2 +-
 app/Template/task_recurrence/info.php         |  4 +-
 app/Template/task_status/close.php            |  2 +-
 app/Template/task_status/open.php             |  2 +-
 app/Template/task_suppression/remove.php      |  2 +-
 app/Template/user_view/timesheet.php          |  4 +-
 97 files changed, 209 insertions(+), 219 deletions(-)

diff --git a/app/Controller/CommentController.php b/app/Controller/CommentController.php
index 8360c641c..8557b36a6 100644
--- a/app/Controller/CommentController.php
+++ b/app/Controller/CommentController.php
@@ -24,15 +24,12 @@ class CommentController extends BaseController
      */
     public function create(array $values = array(), array $errors = array())
     {
-        $project = $this->getProject();
         $task = $this->getTask();
-        $values['project_id'] = $task['project_id'];
 
         $this->response->html($this->helper->layout->task('comment/create', array(
             'values' => $values,
             'errors' => $errors,
-            'task' => $task,
-            'project' => $project,
+            'task' => $task
         )));
     }
 
@@ -57,7 +54,7 @@ class CommentController extends BaseController
                 $this->flash->failure(t('Unable to create your comment.'));
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true);
         } else {
             $this->create($values, $errors);
         }
@@ -81,8 +78,6 @@ class CommentController extends BaseController
             $values = $comment;
         }
 
-        $values['project_id'] = $task['project_id'];
-
         $this->response->html($this->template->render('comment/edit', array(
             'values' => $values,
             'errors' => $errors,
@@ -115,7 +110,7 @@ class CommentController extends BaseController
                 $this->flash->failure(t('Unable to update your comment.'));
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
             return;
         }
 
@@ -156,7 +151,7 @@ class CommentController extends BaseController
             $this->flash->failure(t('Unable to remove this comment.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true);
     }
 
     /**
@@ -173,7 +168,7 @@ class CommentController extends BaseController
         $this->response->redirect($this->helper->url->to(
             'TaskViewController',
             'show',
-            array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+            array('task_id' => $task['id']),
             'comments'
         ));
     }
diff --git a/app/Controller/CommentMailController.php b/app/Controller/CommentMailController.php
index 920f786a5..575b8509f 100644
--- a/app/Controller/CommentMailController.php
+++ b/app/Controller/CommentMailController.php
@@ -12,15 +12,13 @@ class CommentMailController extends BaseController
 {
     public function create(array $values = array(), array $errors = array())
     {
-        $project = $this->getProject();
         $task = $this->getTask();
 
         $this->response->html($this->helper->layout->task('comment_mail/create', array(
             'values'  => $values,
             'errors'  => $errors,
             'task'    => $task,
-            'project' => $project,
-            'members' => $this->projectPermissionModel->getMembersWithEmail($project['id']),
+            'members' => $this->projectPermissionModel->getMembersWithEmail($task['project_id']),
         )));
     }
 
@@ -43,7 +41,7 @@ class CommentMailController extends BaseController
                 $this->flash->failure(t('Unable to create your comment.'));
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true);
         } else {
             $this->create($values, $errors);
         }
diff --git a/app/Controller/ExternalTaskCreationController.php b/app/Controller/ExternalTaskCreationController.php
index 0d87c0b68..6ad515d20 100644
--- a/app/Controller/ExternalTaskCreationController.php
+++ b/app/Controller/ExternalTaskCreationController.php
@@ -91,7 +91,7 @@ class ExternalTaskCreationController extends BaseController
         } else {
             $taskId = $this->taskCreationModel->create($values);
             $this->flash->success(t('Task created successfully.'));
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $project['id'], 'task_id' => $taskId)), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $taskId)), true);
         }
     }
 }
diff --git a/app/Controller/SubtaskController.php b/app/Controller/SubtaskController.php
index d5db9b2ef..8144d18f9 100644
--- a/app/Controller/SubtaskController.php
+++ b/app/Controller/SubtaskController.php
@@ -37,7 +37,7 @@ class SubtaskController extends BaseController
             'task' => $task,
         )));
     }
-    
+
     /**
      * Prepare form values
      *
@@ -86,7 +86,7 @@ class SubtaskController extends BaseController
 
                 if (! $this->subtaskModel->create($subtaskValues)) {
                     $this->flash->failure(t('Unable to create your sub-task.'));
-                    $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true);
+                    $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'subtasks'), true);
                     return false;
                 }
 
@@ -110,7 +110,7 @@ class SubtaskController extends BaseController
             }
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'subtasks'), true);
     }
 
     /**
@@ -160,7 +160,7 @@ class SubtaskController extends BaseController
                 $this->flash->failure(t('Unable to update your sub-task.'));
             }
 
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         }
 
         return $this->edit($values, $errors);
@@ -199,7 +199,7 @@ class SubtaskController extends BaseController
             $this->flash->failure(t('Unable to remove this sub-task.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
     }
 
     /**
diff --git a/app/Controller/SubtaskConverterController.php b/app/Controller/SubtaskConverterController.php
index dafbb7e00..5be032ea6 100644
--- a/app/Controller/SubtaskConverterController.php
+++ b/app/Controller/SubtaskConverterController.php
@@ -23,11 +23,10 @@ class SubtaskConverterController extends BaseController
 
     public function save()
     {
-        $project = $this->getProject();
         $task = $this->getTask();
         $subtask = $this->getSubtask($task);
 
-        $task_id = $this->subtaskTaskConversionModel->convertToTask($project['id'], $subtask['id']);
+        $task_id = $this->subtaskTaskConversionModel->convertToTask($task['project_id'], $subtask['id']);
 
         if ($task_id !== false) {
             $this->flash->success(t('Subtask converted to task successfully.'));
@@ -35,6 +34,6 @@ class SubtaskConverterController extends BaseController
             $this->flash->failure(t('Unable to convert the subtask.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $project['id'], 'task_id' => $task_id)), true);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task_id)), true);
     }
 }
diff --git a/app/Controller/SubtaskRestrictionController.php b/app/Controller/SubtaskRestrictionController.php
index 315b023d1..e777b1dca 100644
--- a/app/Controller/SubtaskRestrictionController.php
+++ b/app/Controller/SubtaskRestrictionController.php
@@ -56,6 +56,6 @@ class SubtaskRestrictionController extends BaseController
             'status'  => SubtaskModel::STATUS_INPROGRESS,
         ));
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
     }
 }
diff --git a/app/Controller/TaskDuplicationController.php b/app/Controller/TaskDuplicationController.php
index 6f81b25a9..6ebb6d592 100644
--- a/app/Controller/TaskDuplicationController.php
+++ b/app/Controller/TaskDuplicationController.php
@@ -25,10 +25,10 @@ class TaskDuplicationController extends BaseController
 
             if ($task_id > 0) {
                 $this->flash->success(t('Task created successfully.'));
-                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id)));
+                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task_id)));
             } else {
                 $this->flash->failure(t('Unable to create this task.'));
-                return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+                return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('task_id' => $task['id'])), true);
             }
         }
 
@@ -57,7 +57,7 @@ class TaskDuplicationController extends BaseController
                                                                 $values['category_id'],
                                                                 $values['owner_id'])) {
                 $this->flash->success(t('Task updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $values['project_id'], 'task_id' => $task['id'])));
+                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
             }
 
             $this->flash->failure(t('Unable to update your task.'));
diff --git a/app/Controller/TaskExternalLinkController.php b/app/Controller/TaskExternalLinkController.php
index 946451fcb..02cf472d3 100644
--- a/app/Controller/TaskExternalLinkController.php
+++ b/app/Controller/TaskExternalLinkController.php
@@ -85,7 +85,7 @@ class TaskExternalLinkController extends BaseController
                 $this->flash->success(t('Unable to create your link.'));
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         } else {
             $provider = $this->externalLinkManager->getProvider($values['link_type']);
             $this->response->html($this->template->render('task_external_link/create', array(
@@ -140,7 +140,7 @@ class TaskExternalLinkController extends BaseController
 
         if ($valid && $this->taskExternalLinkModel->update($values)) {
             $this->flash->success(t('Link updated successfully.'));
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         }
 
         return $this->edit($values, $errors);
@@ -179,6 +179,6 @@ class TaskExternalLinkController extends BaseController
             $this->flash->failure(t('Unable to remove this link.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
     }
 }
diff --git a/app/Controller/TaskFileController.php b/app/Controller/TaskFileController.php
index 4c489238c..b3192b3a7 100644
--- a/app/Controller/TaskFileController.php
+++ b/app/Controller/TaskFileController.php
@@ -21,7 +21,7 @@ class TaskFileController extends BaseController
 
         if ($this->request->isPost() && $this->taskFileModel->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
             $this->flash->success(t('Screenshot uploaded successfully.'));
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         }
 
         return $this->response->html($this->template->render('task_file/screenshot', array(
@@ -66,7 +66,7 @@ class TaskFileController extends BaseController
                 $this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         }
     }
 
@@ -87,7 +87,7 @@ class TaskFileController extends BaseController
             $this->flash->failure(t('Unable to remove this file.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
     }
 
     /**
diff --git a/app/Controller/TaskInternalLinkController.php b/app/Controller/TaskInternalLinkController.php
index 02cc15c4d..7ab01374a 100644
--- a/app/Controller/TaskInternalLinkController.php
+++ b/app/Controller/TaskInternalLinkController.php
@@ -65,7 +65,7 @@ class TaskInternalLinkController extends BaseController
                     ));
                 }
 
-                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
             }
 
             $errors = array('title' => array(t('The exact same link already exists')));
@@ -123,7 +123,7 @@ class TaskInternalLinkController extends BaseController
         if ($valid) {
             if ($this->taskLinkModel->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
                 $this->flash->success(t('Link updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links');
+                return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])).'#links');
             }
 
             $this->flash->failure(t('Unable to update your link.'));
@@ -165,6 +165,6 @@ class TaskInternalLinkController extends BaseController
             $this->flash->failure(t('Unable to remove this link.'));
         }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
     }
 }
diff --git a/app/Controller/TaskMailController.php b/app/Controller/TaskMailController.php
index 9e753af1d..5197f4fad 100644
--- a/app/Controller/TaskMailController.php
+++ b/app/Controller/TaskMailController.php
@@ -12,15 +12,13 @@ class TaskMailController extends BaseController
 {
     public function create(array $values = array(), array $errors = array())
     {
-        $project = $this->getProject();
         $task = $this->getTask();
 
         $this->response->html($this->helper->layout->task('task_mail/create', array(
             'values'  => $values,
             'errors'  => $errors,
             'task'    => $task,
-            'project' => $project,
-            'members' => $this->projectPermissionModel->getMembersWithEmail($project['id']),
+            'members' => $this->projectPermissionModel->getMembersWithEmail($task['project_id']),
         )));
     }
 
@@ -41,7 +39,7 @@ class TaskMailController extends BaseController
                 'task_id' => $task['id'],
             ));
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true);
         } else {
             $this->create($values, $errors);
         }
diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index b2b94c3d5..3e6f5d178 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -23,7 +23,7 @@ class TaskModificationController extends BaseController
         if (! $this->helper->projectRole->canUpdateTask($task)) {
             throw new AccessForbiddenException(t('You are not allowed to update tasks assigned to someone else.'));
         }
-        
+
         if (! $this->helper->projectRole->canChangeAssignee($task)) {
             throw new AccessForbiddenException(t('You are not allowed to change the assignee.'));
         }
@@ -67,7 +67,7 @@ class TaskModificationController extends BaseController
                 $this->response->redirect($this->helper->url->to('DashboardController', 'tasks', ['user_id' => $this->userSession->getId()]));
                 break;
             default:
-                $this->response->redirect($this->helper->url->to('TaskViewController', 'show', ['project_id' => $task['project_id'], 'task_id' => $task['id']]));
+                $this->response->redirect($this->helper->url->to('TaskViewController', 'show', ['task_id' => $task['id']]));
         }
     }
 
@@ -146,7 +146,7 @@ class TaskModificationController extends BaseController
 
         if ($valid && $this->updateTask($task, $values, $errors)) {
             $this->flash->success(t('Task updated successfully.'));
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         } else {
             $this->flash->failure(t('Unable to update your task.'));
             $this->edit($values, $errors);
diff --git a/app/Controller/TaskMovePositionController.php b/app/Controller/TaskMovePositionController.php
index 802eadeda..f630641a0 100644
--- a/app/Controller/TaskMovePositionController.php
+++ b/app/Controller/TaskMovePositionController.php
@@ -47,6 +47,6 @@ class TaskMovePositionController extends BaseController
             $values['swimlane_id']
         );
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
     }
 }
diff --git a/app/Controller/TaskRecurrenceController.php b/app/Controller/TaskRecurrenceController.php
index 7f14cb534..cd23ea3f5 100644
--- a/app/Controller/TaskRecurrenceController.php
+++ b/app/Controller/TaskRecurrenceController.php
@@ -58,7 +58,7 @@ class TaskRecurrenceController extends BaseController
                 $this->flash->failure(t('Unable to update your task.'));
             }
 
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         }
 
         return $this->edit($values, $errors);
diff --git a/app/Controller/TaskStatusController.php b/app/Controller/TaskStatusController.php
index 56d38400d..5dbd07ec7 100644
--- a/app/Controller/TaskStatusController.php
+++ b/app/Controller/TaskStatusController.php
@@ -52,7 +52,7 @@ class TaskStatusController extends BaseController
                 $this->flash->failure($failure_message);
             }
 
-            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
         } else {
             $this->response->html($this->template->render($template, array(
                 'task' => $task,
diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index 05c59bc9b..4e348aa2c 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -107,7 +107,7 @@ class TaskViewController extends BaseController
         $task = $this->getTask();
 
         $subtask_paginator = $this->paginator
-            ->setUrl('TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks'))
+            ->setUrl('TaskViewController', 'timetracking', array('task_id' => $task['id'], 'pagination' => 'subtasks'))
             ->setMax(15)
             ->setOrder('start')
             ->setDirection('DESC')
diff --git a/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php b/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php
index b7b81d87c..034617262 100644
--- a/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php
+++ b/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php
@@ -28,7 +28,7 @@ class SubtaskTimeTrackingCalendarFormatter extends BaseFormatter implements Form
                 'backgroundColor' => $this->colorModel->getBackgroundColor($row['color_id']),
                 'borderColor' => $this->colorModel->getBorderColor($row['color_id']),
                 'textColor' => 'black',
-                'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])),
+                'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $row['task_id'])),
                 'editable' => false,
             );
         }
diff --git a/app/Formatter/TaskApiFormatter.php b/app/Formatter/TaskApiFormatter.php
index 60840bebe..f2e25d087 100644
--- a/app/Formatter/TaskApiFormatter.php
+++ b/app/Formatter/TaskApiFormatter.php
@@ -28,7 +28,7 @@ class TaskApiFormatter extends BaseFormatter implements FormatterInterface
     public function format()
     {
         if (! empty($this->task)) {
-            $this->task['url'] = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $this->task['id'], 'project_id' => $this->task['project_id']), '', true);
+            $this->task['url'] = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $this->task['id']), '', true);
             $this->task['color'] = $this->colorModel->getColorProperties($this->task['color_id']);
         }
 
diff --git a/app/Formatter/TaskICalFormatter.php b/app/Formatter/TaskICalFormatter.php
index 387074e51..abe595fdd 100644
--- a/app/Formatter/TaskICalFormatter.php
+++ b/app/Formatter/TaskICalFormatter.php
@@ -128,7 +128,7 @@ class TaskICalFormatter extends BaseFormatter implements FormatterInterface
         $vEvent->setSummary(t('#%d', $task['id']).' '.$task['title']);
         $vEvent->setDescription($task['description']);
         $vEvent->setDescriptionHTML($this->helper->text->markdown($task['description']));
-        $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])));
 
         if (! empty($task['owner_id'])) {
             $attendees = new Attendees;
diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php
index c1c92aa0d..aa3a47655 100644
--- a/app/Helper/SubtaskHelper.php
+++ b/app/Helper/SubtaskHelper.php
@@ -82,10 +82,10 @@ class SubtaskHelper extends Base
         $html = '<span class="subtask-timer-toggle">';
 
         if ($subtask['is_timer_started']) {
-            $html .= $this->helper->url->icon('pause', t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer');
+            $html .= $this->helper->url->icon('pause', t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer');
             $html .= ' (' . $this->helper->dt->age($subtask['timer_start_date']) .')';
         } else {
-            $html .= $this->helper->url->icon('play-circle-o', t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer');
+            $html .= $this->helper->url->icon('play-circle-o', t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer');
         }
 
         $html .= '</span>';
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 669421880..88e5c2d3d 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -89,14 +89,14 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('project/:project_id/import', 'TaskImportController', 'show');
 
             // Task routes
-            $container['route']->addRoute('project/:project_id/task/:task_id', 'TaskViewController', 'show');
+            $container['route']->addRoute('task/:task_id', 'TaskViewController', 'show');
             $container['route']->addRoute('t/:task_id', 'TaskViewController', 'show');
             $container['route']->addRoute('public/task/:task_id/:token', 'TaskViewController', 'readonly');
 
-            $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'ActivityController', 'task');
-            $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'TaskViewController', 'transitions');
-            $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'TaskViewController', 'analytics');
-            $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'TaskViewController', 'timetracking');
+            $container['route']->addRoute('task/:task_id/activity', 'ActivityController', 'task');
+            $container['route']->addRoute('task/:task_id/transitions', 'TaskViewController', 'transitions');
+            $container['route']->addRoute('task/:task_id/analytics', 'TaskViewController', 'analytics');
+            $container['route']->addRoute('task/:task_id/time-tracking', 'TaskViewController', 'timetracking');
 
             // Exports
             $container['route']->addRoute('export/tasks/:project_id', 'ExportController', 'tasks');
diff --git a/app/Template/analytic/time_comparison.php b/app/Template/analytic/time_comparison.php
index 754c68f2f..bf2cd12df 100644
--- a/app/Template/analytic/time_comparison.php
+++ b/app/Template/analytic/time_comparison.php
@@ -36,10 +36,10 @@
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
                 <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
-                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
                     <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php
index 28e0813e9..14dd239ce 100644
--- a/app/Template/board/task_avatar.php
+++ b/app/Template/board/task_avatar.php
@@ -3,7 +3,7 @@
     <span
         <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
         class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>">
     <?php else: ?>
         class="task-board-assignee">
     <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 9982da423..2cdb3bd86 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -8,7 +8,7 @@
                 $this->text->e($task['category_name']),
                 'TaskModificationController',
                 'edit',
-                array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+                array('task_id' => $task['id']),
                 false,
                 'js-modal-large' . (! empty($task['category_description']) ? ' tooltip' : ''),
                 t('Change category')
@@ -79,27 +79,27 @@
     <div class="task-board-icons-row">
 
         <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90 fa-inverse"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90 fa-inverse"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if (! empty($task['nb_links'])): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-code-fork fa-fw"></i>'.$task['nb_links'], $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-code-fork fa-fw"></i>'.$task['nb_links'], $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if (! empty($task['nb_external_links'])): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-external-link fa-fw"></i>'.$task['nb_external_links'], $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-external-link fa-fw"></i>'.$task['nb_external_links'], $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if (! empty($task['nb_subtasks'])): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-bars fa-fw"></i>'.round($task['nb_completed_subtasks'] / $task['nb_subtasks'] * 100, 0).'%', $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-bars fa-fw"></i>'.round($task['nb_completed_subtasks'] / $task['nb_subtasks'] * 100, 0).'%', $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if (! empty($task['nb_files'])): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-paperclip fa-fw"></i>'.$task['nb_files'], $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-paperclip fa-fw"></i>'.$task['nb_files'], $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if ($task['nb_comments'] > 0): ?>
@@ -112,14 +112,14 @@
                     $task['nb_comments'],
                     'CommentListController',
                     'show',
-                    array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+                    array('task_id' => $task['id']),
                     $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments'])
                 ) ?>
             <?php endif ?>
         <?php endif ?>
 
         <?php if (! empty($task['description'])): ?>
-            <?= $this->app->tooltipLink('<i class="fa fa-file-text-o"></i>', $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+            <?= $this->app->tooltipLink('<i class="fa fa-file-text-o"></i>', $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id']))) ?>
         <?php endif ?>
 
         <?php if ($task['is_active'] == 1): ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index c4e1c0234..276a407c6 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -10,7 +10,7 @@
      data-owner-id="<?= $task['owner_id'] ?>"
      data-category-id="<?= $task['category_id'] ?>"
      data-due-date="<?= $task['date_due'] ?>"
-     data-task-url="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+     data-task-url="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'])) ?>">
 
     <div class="task-board-sort-handle" style="display: none;"><i class="fa fa-arrows-alt"></i></div>
 
@@ -20,7 +20,7 @@
             <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                 <?= $this->render('task/dropdown', array('task' => $task, 'redirect' => 'board')) ?>
                 <?php if ($this->projectRole->canUpdateTask($task)): ?>
-                    <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                    <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>
                 <?php endif ?>
             <?php else: ?>
                 <strong><?= '#'.$task['id'] ?></strong>
@@ -31,7 +31,7 @@
                     <?= $this->text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
                 </span> -
             <?php endif ?>
-            <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', $this->text->e($task['title'])) ?>
+            <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', $this->text->e($task['title'])) ?>
         </div>
     <?php else: ?>
         <div class="task-board-expanded">
@@ -40,7 +40,7 @@
                 <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                     <?= $this->render('task/dropdown', array('task' => $task, 'redirect' => 'board')) ?>
                     <?php if ($this->projectRole->canUpdateTask($task)): ?>
-                        <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                        <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>
                     <?php endif ?>
                 <?php else: ?>
                     <strong><?= '#'.$task['id'] ?></strong>
@@ -57,7 +57,7 @@
 
             <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
             <div class="task-board-title">
-                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'])) ?>
             </div>
             <?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
 
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 5cd9b0043..5bf58ef18 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -9,13 +9,13 @@
         </tr>
         <tr>
             <td>
-                <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                 <?php if ($this->file->getPreviewType($file['name']) !== null || $file['is_image'] == 1): ?>
-                    &nbsp;<?= $this->modal->large('eye', t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
-                    &nbsp;<?= $this->url->icon('external-link', t('View file'), 'FileViewerController', ($file['is_image'] == 1 ? 'image' : 'show'), array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, '', '', true) ?>
+                    &nbsp;<?= $this->modal->large('eye', t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
+                    &nbsp;<?= $this->url->icon('external-link', t('View file'), 'FileViewerController', ($file['is_image'] == 1 ? 'image' : 'show'), array('task_id' => $task['id'], 'file_id' => $file['id']), false, '', '', true) ?>
                 <?php elseif ($this->file->getBrowserViewType($file['name']) !== null): ?>
                         <i class="fa fa-eye fa-fw"></i>
-                        <?= $this->url->link(t('View file'), 'FileViewerController', 'browser', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, '', '', true) ?>
+                        <?= $this->url->link(t('View file'), 'FileViewerController', 'browser', array('task_id' => $task['id'], 'file_id' => $file['id']), false, '', '', true) ?>
                 <?php endif ?>
             </td>
         </tr>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 95269c762..812d6de0b 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -2,11 +2,11 @@
     <h2><?= t('Add a comment') ?></h2>
     <ul>
         <li>
-            <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'])) ?>
         </li>
     </ul>
 </div>
-<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true, 'aria-label' => t('New comment'))) ?>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index fc91dcc77..d2e073e4c 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit a comment') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true, 'aria-label' => t('Comment'))) ?>
diff --git a/app/Template/comment/remove.php b/app/Template/comment/remove.php
index 03f16e00d..14ab47887 100644
--- a/app/Template/comment/remove.php
+++ b/app/Template/comment/remove.php
@@ -16,6 +16,6 @@
     <?= $this->modal->confirmButtons(
         'CommentController',
         'remove',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])
+        array('task_id' => $task['id'], 'comment_id' => $comment['id'])
     ) ?>
 </div>
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 5f15ffd68..56a99eb18 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -17,14 +17,14 @@
             <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
             <ul>
                 <li>
-                    <?= $this->url->icon('link', t('Link'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', '', $this->app->isAjax(), 'comment-'.$comment['id']) ?>
+                    <?= $this->url->icon('link', t('Link'), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', '', $this->app->isAjax(), 'comment-'.$comment['id']) ?>
                 </li>
                 <?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
                     <li>
-                        <?= $this->modal->medium('edit', t('Edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
+                        <?= $this->modal->medium('edit', t('Edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'comment_id' => $comment['id'])) ?>
                     </li>
                     <li>
-                        <?= $this->modal->confirm('trash-o', t('Remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
+                        <?= $this->modal->confirm('trash-o', t('Remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'comment_id' => $comment['id'])) ?>
                     </li>
                 <?php endif ?>
             </ul>
diff --git a/app/Template/comment_list/create.php b/app/Template/comment_list/create.php
index 213b8ca99..a816ebc64 100644
--- a/app/Template/comment_list/create.php
+++ b/app/Template/comment_list/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a comment') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('CommentListController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentListController', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->textEditor('comment', array('project_id' => $task['project_id']), array(), array('required' => true, 'aria-label' => t('New comment'))) ?>
     <?= $this->modal->submitButtons() ?>
diff --git a/app/Template/comment_list/show.php b/app/Template/comment_list/show.php
index 4b6b765db..5ebd7526c 100644
--- a/app/Template/comment_list/show.php
+++ b/app/Template/comment_list/show.php
@@ -3,11 +3,11 @@
     <?php if (!isset($is_public) || !$is_public): ?>
         <ul>
             <li>
-                <?= $this->url->icon('sort', t('Change sorting'), 'CommentListController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'js-modal-replace') ?>
+                <?= $this->url->icon('sort', t('Change sorting'), 'CommentListController', 'toggleSorting', array('task_id' => $task['id']), false, 'js-modal-replace') ?>
             </li>
             <?php if ($editable): ?>
                 <li>
-                    <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                    <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'])) ?>
                 </li>
             <?php endif ?>
         </ul>
diff --git a/app/Template/comment_mail/create.php b/app/Template/comment_mail/create.php
index 8d5ceab7b..e58b04fe2 100644
--- a/app/Template/comment_mail/create.php
+++ b/app/Template/comment_mail/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Create and send a comment by email') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('CommentMailController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off" class="js-mail-form">
+<form method="post" action="<?= $this->url->href('CommentMailController', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off" class="js-mail-form">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 780bba938..de3f22636 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s commented the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/comment_delete.php b/app/Template/event/comment_delete.php
index e3a2f9fad..13ef37de8 100644
--- a/app/Template/event/comment_delete.php
+++ b/app/Template/event/comment_delete.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s removed a comment on the task %s',
         $this->text->e($author),
-        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
     ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index 9e25ec2df..0d911fd14 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated a comment on the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index 9a115c737..5f3c76b79 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s created a subtask for the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/subtask_delete.php b/app/Template/event/subtask_delete.php
index 7f0d6d589..b1e487fdb 100644
--- a/app/Template/event/subtask_delete.php
+++ b/app/Template/event/subtask_delete.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s removed a subtask for the task %s',
         $this->text->e($author),
-        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
     ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index e566022e2..3bb078a08 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated a subtask for the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index 405f8ac1e..f57ab639a 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -4,11 +4,11 @@
     <?php if (! empty($assignee)): ?>
         <?= e('%s changed the assignee of the task %s to %s',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'])),
                 $this->text->e($assignee)
             ) ?>
     <?php else: ?>
-        <?= e('%s removed the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= e('%s removed the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))) ?>
     <?php endif ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 1ac81ea9b..aefd3a775 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s closed the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 9d0ff3586..89865cc6a 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s created the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 7e58fdc18..b197d3ce7 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s attached a new file to the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_file_destroy.php b/app/Template/event/task_file_destroy.php
index cb21c42ac..882c51bc1 100755
--- a/app/Template/event/task_file_destroy.php
+++ b/app/Template/event/task_file_destroy.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s removed a file from the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_internal_link_create_update.php b/app/Template/event/task_internal_link_create_update.php
index 5a9144aca..303103321 100644
--- a/app/Template/event/task_internal_link_create_update.php
+++ b/app/Template/event/task_internal_link_create_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s set a new internal link for the task %s',
         $this->text->e($author),
-        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
     ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_internal_link_delete.php b/app/Template/event/task_internal_link_delete.php
index c60d17e34..54194caa5 100644
--- a/app/Template/event/task_internal_link_delete.php
+++ b/app/Template/event/task_internal_link_delete.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s removed an internal link for the task %s',
         $this->text->e($author),
-        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+        $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
     ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index e7e5ec284..23f0af7f6 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s moved the task %s to the column "%s"',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'])),
             $this->text->e($task['column_title'])
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index 48fbbb1e6..5dedbf67a 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s moved the task %s to the position #%d in the column "%s"',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'])),
             $task['position'],
             $this->text->e($task['column_title'])
         ) ?>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index a467875b5..2190cf333 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -2,12 +2,12 @@
     <?php if ($task['swimlane_id'] == 0): ?>
         <?= e('%s moved the task %s to the first swimlane',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
             ) ?>
     <?php else: ?>
         <?= e('%s moved the task %s to the swimlane "%s"',
                 $this->text->e($author),
-                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'])),
                 $this->text->e($task['swimlane_name'])
             ) ?>
     <?php endif ?>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index 6d5252a1b..eee795d8c 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s opened the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 2608f6236..88c90971e 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
     <?= e('%s updated the task %s',
             $this->text->e($author),
-            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']))
         ) ?>
     <small class="activity-date"><?= $this->dt->datetime($date_creation) ?></small>
 </p>
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
index 663a591a3..6888d50b2 100644
--- a/app/Template/notification/footer.php
+++ b/app/Template/notification/footer.php
@@ -3,7 +3,7 @@ Kanboard
 
 <?php if ($this->app->config('application_url') != ''): ?>
     <?php if (isset($task['id'])): ?>
-        - <?= $this->url->absoluteLink(t('view the task on Kanboard'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        - <?= $this->url->absoluteLink(t('view the task on Kanboard'), 'TaskViewController', 'show', array('task_id' => $task['id'])) ?>
     <?php endif ?>
     - <?= $this->url->absoluteLink(t('view the board on Kanboard'), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?>
 <?php endif ?>
diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php
index 88140af03..8da0d6208 100644
--- a/app/Template/notification/task_overdue.php
+++ b/app/Template/notification/task_overdue.php
@@ -16,7 +16,7 @@
             <td style="border: 1px solid #eee;">#<?= $task['id'] ?></td>
             <td style="border: 1px solid #eee;">
                 <?php if ($this->app->config('application_url') !== ''): ?>
-                    <?= $this->url->absoluteLink($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                    <?= $this->url->absoluteLink($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'])) ?>
                 <?php else: ?>
                     <?= $this->text->e($task['title']) ?>
                 <?php endif ?>
diff --git a/app/Template/project_user_overview/tasks.php b/app/Template/project_user_overview/tasks.php
index 1e01a43f8..6f7513458 100644
--- a/app/Template/project_user_overview/tasks.php
+++ b/app/Template/project_user_overview/tasks.php
@@ -14,7 +14,7 @@
         <?php foreach ($paginator->getCollection() as $task): ?>
         <tr>
             <td class="task-table color-<?= $task['color_id'] ?>">
-                <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
             </td>
             <td>
                 <?= $this->url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?>
@@ -23,7 +23,7 @@
                 <?= $this->text->e($task['column_name']) ?>
             </td>
             <td>
-                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
             </td>
             <td>
                 <?php if ($task['assignee_username']): ?>
diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php
index 1ed36d474..6919347f2 100644
--- a/app/Template/subtask/create.php
+++ b/app/Template/subtask/create.php
@@ -12,7 +12,7 @@
     </p>
 <?php endif ?>
 
-<form method="post" action="<?= $this->url->href('SubtaskController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('SubtaskController', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->subtask->renderBulkTitleField($values, $errors, array('autofocus')) ?>
@@ -20,7 +20,7 @@
     <?= $this->subtask->renderTimeEstimatedField($values, $errors) ?>
 
     <?= $this->hook->render('template:subtask:form:create', array('values' => $values, 'errors' => $errors)) ?>
-    
+
     <?= $this->form->checkbox('another_subtask', t('Create another sub-task'), 1, isset($values['another_subtask']) && $values['another_subtask'] == 1) ?>
 
     <?= $this->modal->submitButtons() ?>
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php
index aed57e957..90aaca89a 100644
--- a/app/Template/subtask/edit.php
+++ b/app/Template/subtask/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit a sub-task') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('SubtaskController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('SubtaskController', 'update', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->subtask->renderTitleField($values, $errors, array('autofocus')) ?>
diff --git a/app/Template/subtask/menu.php b/app/Template/subtask/menu.php
index 9ac8fc427..f62e6f23e 100644
--- a/app/Template/subtask/menu.php
+++ b/app/Template/subtask/menu.php
@@ -2,13 +2,13 @@
     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><div class="subtask-submenu"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></div></a>
     <ul>
         <li>
-            <?= $this->modal->medium('edit', t('Edit'), 'SubtaskController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+            <?= $this->modal->medium('edit', t('Edit'), 'SubtaskController', 'edit', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->confirm('trash-o', t('Remove'), 'SubtaskController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+            <?= $this->modal->confirm('trash-o', t('Remove'), 'SubtaskController', 'confirm', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->confirm('clone', t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+            <?= $this->modal->confirm('clone', t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
         </li>
     </ul>
 </div>
diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php
index cf9bbc358..3db814ed4 100644
--- a/app/Template/subtask/remove.php
+++ b/app/Template/subtask/remove.php
@@ -15,6 +15,6 @@
     <?= $this->modal->confirmButtons(
         'SubtaskController',
         'remove',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])
+        array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])
     ) ?>
 </div>
diff --git a/app/Template/subtask/table.php b/app/Template/subtask/table.php
index b8b5c2d95..8b9e04061 100644
--- a/app/Template/subtask/table.php
+++ b/app/Template/subtask/table.php
@@ -1,7 +1,7 @@
 <?php if (! empty($subtasks)): ?>
     <table
         class="subtasks-table table-striped table-scrolling"
-        data-save-position-url="<?= $this->url->href('SubtaskController', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>"
+        data-save-position-url="<?= $this->url->href('SubtaskController', 'movePosition', array('task_id' => $task['id'])) ?>"
     >
     <thead>
         <tr>
diff --git a/app/Template/subtask_converter/show.php b/app/Template/subtask_converter/show.php
index 9ecc70c89..12e1b1bb2 100644
--- a/app/Template/subtask_converter/show.php
+++ b/app/Template/subtask_converter/show.php
@@ -15,6 +15,6 @@
     <?= $this->modal->confirmButtons(
         'SubtaskConverterController',
         'save',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])
+        array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])
     ) ?>
 </div>
diff --git a/app/Template/subtask_restriction/show.php b/app/Template/subtask_restriction/show.php
index b6c56a129..710e7508b 100644
--- a/app/Template/subtask_restriction/show.php
+++ b/app/Template/subtask_restriction/show.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('You already have one subtask in progress') ?></h2>
 </div>
-<form action="<?= $this->url->href('SubtaskRestrictionController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" method="post">
+<form action="<?= $this->url->href('SubtaskRestrictionController', 'save', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>" method="post">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index f9b788a65..d659ef48a 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -86,7 +86,7 @@
                         <?php endif ?>
                         </span>
                         <?php if ($editable && $task['owner_id'] != $this->user->getId()): ?>
-                            - <span><?= $this->url->link(t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken()]) ?></span>
+                            - <span><?= $this->url->link(t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken()]) ?></span>
                         <?php endif ?>
                     </li>
                     <?php if ($task['creator_username']): ?>
@@ -124,7 +124,7 @@
                         <?php if ($task['date_started']): ?>
                             <span><?= $this->dt->datetime($task['date_started']) ?></span>
                         <?php elseif ($editable): ?>
-                            <span><?= $this->url->link(t('Start now'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken()]) ?></span>
+                            <span><?= $this->url->link(t('Start now'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken()]) ?></span>
                         <?php endif ?>
                     </li>
                     <li>
@@ -165,7 +165,7 @@
 
     <?php if (! empty($task['external_uri']) && ! empty($task['external_provider'])): ?>
         <?= $this->app->component('external-task-view', array(
-            'url' => $this->url->href('ExternalTaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])),
+            'url' => $this->url->href('ExternalTaskViewController', 'show', array('task_id' => $task['id'])),
         )) ?>
     <?php endif ?>
 
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index bf170a48f..e73637bc8 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -6,46 +6,46 @@
         <?php if ($this->projectRole->canUpdateTask($task)): ?>
             <?php if ($this->projectRole->canChangeAssignee($task) && array_key_exists('owner_id', $task) && $task['owner_id'] != $this->user->getId()): ?>
             <li>
-                <?= $this->url->icon('hand-o-right', t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken(), 'redirect' => isset($redirect) ? $redirect : '']) ?>
+                <?= $this->url->icon('hand-o-right', t('Assign to me'), 'TaskModificationController', 'assignToMe', ['task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken(), 'redirect' => isset($redirect) ? $redirect : '']) ?>
             </li>
             <?php endif ?>
             <?php if (array_key_exists('date_started', $task) && empty($task['date_started'])): ?>
             <li>
-                <?= $this->url->icon('play', t('Set the start date automatically'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken(), 'redirect' => isset($redirect) ? $redirect : '']) ?>
+                <?= $this->url->icon('play', t('Set the start date automatically'), 'TaskModificationController', 'start', ['task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken(), 'redirect' => isset($redirect) ? $redirect : '']) ?>
             </li>
             <?php endif ?>
             <li>
-                <?= $this->modal->large('edit', t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->modal->large('edit', t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>
             </li>
         <?php endif ?>
         <li>
-            <?= $this->modal->medium('plus', t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('plus', t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:dropdown:after-basic-actions', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->medium('code-fork', t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('code-fork', t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->medium('external-link', t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('external-link', t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:dropdown:after-add-links', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->small('comment-o', t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('comment-o', t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:dropdown:after-add-comment', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->medium('file', t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('file', t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->medium('camera', t('Add a screenshot'), 'TaskPopoverController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('camera', t('Add a screenshot'), 'TaskPopoverController', 'screenshot', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:dropdown:after-add-attachments', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->small('files-o', t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('files-o', t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'])) ?>
         </li>
         <li>
             <?= $this->modal->small('clipboard', t('Duplicate to project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
@@ -56,21 +56,21 @@
             <?= $this->modal->small('clone', t('Move to project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li>
-            <?= $this->modal->small('paper-plane', t('Send by email'), 'TaskMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('paper-plane', t('Send by email'), 'TaskMailController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:dropdown:after-send-mail', array('task' => $task)) ?>
 
         <?php if ($this->projectRole->canRemoveTask($task)): ?>
             <li>
-                <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'])) ?>
             </li>
         <?php endif ?>
         <?php if (isset($task['is_active']) && $this->projectRole->canChangeTaskStatusInColumn($task['project_id'], $task['column_id'])): ?>
         <li>
             <?php if ($task['is_active'] == 1): ?>
-                <?= $this->modal->confirm('times', t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->modal->confirm('times', t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'])) ?>
             <?php else: ?>
-                <?= $this->modal->confirm('check-square-o', t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->modal->confirm('check-square-o', t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'])) ?>
             <?php endif ?>
         </li>
         <?php endif ?>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 7f6c29139..19f7791e8 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -3,10 +3,10 @@
     <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?>
     <section
         class="sidebar-container" id="task-view"
-        data-edit-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-internal-link-url="<?= $this->url->href('TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-comment-url="<?= $this->url->href('CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-edit-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>"
+        data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'])) ?>"
+        data-internal-link-url="<?= $this->url->href('TaskInternalLinkController', 'create', array('task_id' => $task['id'])) ?>"
+        data-comment-url="<?= $this->url->href('CommentController', 'create', array('task_id' => $task['id'])) ?>">
 
         <?= $this->render($sidebar_template, array('task' => $task)) ?>
 
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index c5d1d57eb..6bf1db224 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -4,20 +4,20 @@
     </div>
     <ul>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'show') ?>>
-            <?= $this->url->icon('newspaper-o', t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->icon('newspaper-o', t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('ActivityController', 'task') ?>>
-            <?= $this->url->icon('dashboard', t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->icon('dashboard', t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'transitions') ?>>
-            <?= $this->url->icon('arrows-h', t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->icon('arrows-h', t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'analytics') ?>>
-            <?= $this->url->icon('bar-chart', t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->icon('bar-chart', t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'])) ?>
         </li>
         <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'timetracking') ?>>
-            <?= $this->url->icon('clock-o', t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->icon('clock-o', t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'])) ?>
         </li>
         <?php endif ?>
 
@@ -33,40 +33,40 @@
 
         <?php if ($this->projectRole->canUpdateTask($task)): ?>
         <li>
-            <?= $this->modal->large('edit', t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->large('edit', t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->medium('refresh fa-rotate-90', t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('refresh fa-rotate-90', t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'])) ?>
         </li>
         <?php endif ?>
         <li>
-            <?= $this->modal->medium('plus', t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('plus', t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:sidebar:after-basic-actions', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->medium('code-fork', t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('code-fork', t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->medium('external-link', t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('external-link', t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:sidebar:after-add-links', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->small('comment-o', t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('comment-o', t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:sidebar:after-add-comment', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->medium('file', t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('file', t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <li>
-            <?= $this->modal->medium('camera', t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->medium('camera', t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:sidebar:after-add-attachments', array('task' => $task)) ?>
 
         <li>
-            <?= $this->modal->small('files-o', t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('files-o', t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'])) ?>
         </li>
         <li>
             <?= $this->modal->small('clipboard', t('Duplicate to project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
@@ -77,29 +77,29 @@
             <?= $this->modal->small('clone', t('Move to project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li>
-            <?= $this->modal->small('paper-plane', t('Send by email'), 'TaskMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->modal->small('paper-plane', t('Send by email'), 'TaskMailController', 'create', array('task_id' => $task['id'])) ?>
         </li>
         <?= $this->hook->render('template:task:sidebar:after-send-mail', array('task' => $task)) ?>
 
         <?php if ($task['is_active'] == 1 && $this->projectRole->isSortableColumn($task['project_id'], $task['column_id'])): ?>
             <li>
-                <?= $this->modal->small('arrows', t('Move position'), 'TaskMovePositionController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->modal->small('arrows', t('Move position'), 'TaskMovePositionController', 'show', array('task_id' => $task['id'])) ?>
             </li>
         <?php endif ?>
         <?php if ($this->projectRole->canChangeTaskStatusInColumn($task['project_id'], $task['column_id'])): ?>
             <?php if ($task['is_active'] == 1): ?>
                 <li>
-                    <?= $this->modal->confirm('times', t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                    <?= $this->modal->confirm('times', t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'])) ?>
                 </li>
             <?php else: ?>
                 <li>
-                    <?= $this->modal->confirm('check-square-o', t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                    <?= $this->modal->confirm('check-square-o', t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'])) ?>
                 </li>
             <?php endif ?>
         <?php endif ?>
         <?php if ($this->projectRole->canRemoveTask($task)): ?>
             <li>
-                <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board')) ?>
+                <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'redirect' => 'board')) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/task_comments/create.php b/app/Template/task_comments/create.php
index 7829cd297..e8a696ff5 100644
--- a/app/Template/task_comments/create.php
+++ b/app/Template/task_comments/create.php
@@ -1,4 +1,4 @@
-<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/task_comments/show.php b/app/Template/task_comments/show.php
index f815fbb03..150cf0e8d 100644
--- a/app/Template/task_comments/show.php
+++ b/app/Template/task_comments/show.php
@@ -4,9 +4,9 @@
         <?php if (!isset($is_public) || !$is_public): ?>
             <div class="comment-sorting">
                 <small>
-                    <?= $this->url->icon('sort', t('Change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>
+                    <?= $this->url->icon('sort', t('Change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>
                     <?php if ($editable): ?>
-                        <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                        <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'])) ?>
                     <?php endif ?>
                 </small>
             </div>
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index 0aa990b75..03f46ea2e 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -5,11 +5,11 @@
 <?php if (empty($projects_list)): ?>
     <p class="alert"><?= t('There is no destination project available.') ?></p>
     <div class="form-actions">
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'js-modal-close btn') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id']), false, 'js-modal-close btn') ?>
     </div>
 <?php else: ?>
 
-    <form method="post" action="<?= $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form method="post" action="<?= $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'])) ?>" autocomplete="off">
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
 
@@ -21,7 +21,7 @@
             'placeholder'  => t('Choose a project'),
             'replace'      => array(
                 'regex' => 'PROJECT_ID',
-                'url' => $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')),
+                'url' => $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'dst_project_id' => 'PROJECT_ID')),
             )
         )) ?>
 
diff --git a/app/Template/task_duplication/duplicate.php b/app/Template/task_duplication/duplicate.php
index aa02b78cc..8df6b938c 100644
--- a/app/Template/task_duplication/duplicate.php
+++ b/app/Template/task_duplication/duplicate.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskDuplicationController',
         'duplicate',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes')
+        array('task_id' => $task['id'], 'confirmation' => 'yes')
     ) ?>
 </div>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index 1564a577f..a1a2eb6f3 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -5,11 +5,11 @@
 <?php if (empty($projects_list)): ?>
     <p class="alert"><?= t('There is no destination project available.') ?></p>
     <div class="form-actions">
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'js-modal-close btn') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id']), false, 'js-modal-close btn') ?>
     </div>
 <?php else: ?>
 
-    <form method="post" action="<?= $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form method="post" action="<?= $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
@@ -22,7 +22,7 @@
             'placeholder'  => t('Choose a project'),
             'replace'      => array(
                 'regex' => 'PROJECT_ID',
-                'url' => $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')),
+                'url' => $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'dst_project_id' => 'PROJECT_ID')),
             )
         )) ?>
 
diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php
index 04d9bed0d..2ceb1aa06 100644
--- a/app/Template/task_external_link/create.php
+++ b/app/Template/task_external_link/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskExternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskExternalLinkController', 'save', array('task_id' => $task['id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/task_external_link/edit.php b/app/Template/task_external_link/edit.php
index e448b10f3..dd6f8f405 100644
--- a/app/Template/task_external_link/edit.php
+++ b/app/Template/task_external_link/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit external link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskExternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskExternalLinkController', 'update', array('task_id' => $task['id'], 'link_id' => $link['id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php
index 29d85101e..393b97d7c 100644
--- a/app/Template/task_external_link/find.php
+++ b/app/Template/task_external_link/find.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskExternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskExternalLinkController', 'create', array('task_id' => $task['id'])) ?>" method="post" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('External link'), 'text') ?>
diff --git a/app/Template/task_external_link/remove.php b/app/Template/task_external_link/remove.php
index ed8ad15f7..c3eead6f8 100644
--- a/app/Template/task_external_link/remove.php
+++ b/app/Template/task_external_link/remove.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskExternalLinkController',
         'remove',
-        array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])
+        array('link_id' => $link['id'], 'task_id' => $task['id'])
     ) ?>
 </div>
diff --git a/app/Template/task_external_link/table.php b/app/Template/task_external_link/table.php
index 09445c586..315fada6d 100644
--- a/app/Template/task_external_link/table.php
+++ b/app/Template/task_external_link/table.php
@@ -18,10 +18,10 @@
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
                         <li>
-                            <?= $this->modal->medium('edit', t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                            <?= $this->modal->medium('edit', t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'])) ?>
                         </li>
                         <li>
-                            <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskExternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                            <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskExternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'])) ?>
                         </li>
                     </ul>
                 </div>
diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php
index 46fc7d669..41858eca7 100644
--- a/app/Template/task_file/create.php
+++ b/app/Template/task_file/create.php
@@ -5,7 +5,7 @@
 <?= $this->app->component('file-upload', array(
     'csrf'              => $this->app->getToken()->getReusableCSRFToken(),
     'maxSize'           => $max_size,
-    'url'               => $this->url->to('TaskFileController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+    'url'               => $this->url->to('TaskFileController', 'save', array('task_id' => $task['id'])),
     'labelDropzone'     => t('Drag and drop your files here'),
     'labelOr'           => t('or'),
     'labelChooseFiles'  => t('choose files'),
diff --git a/app/Template/task_file/files.php b/app/Template/task_file/files.php
index dd89a82ae..a073d4a7b 100644
--- a/app/Template/task_file/files.php
+++ b/app/Template/task_file/files.php
@@ -15,20 +15,20 @@
                         <ul>
                             <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
-                                    <?= $this->modal->large('eye', t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->modal->large('eye', t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                                 </li>
                             <?php elseif ($this->file->getBrowserViewType($file['name']) !== null): ?>
                                 <li>
                                     <i class="fa fa-eye fa-fw"></i>
-                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'browser', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, '', '', true) ?>
+                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'browser', array('task_id' => $task['id'], 'file_id' => $file['id']), false, '', '', true) ?>
                                 </li>
                             <?php endif ?>
                             <li>
-                                <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                             </li>
                             <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                 <li>
-                                    <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                                 </li>
                             <?php endif ?>
                             <?= $this->hook->render('template:task-file:documents:dropdown', array('task' => $task, 'file' => $file)) ?>
diff --git a/app/Template/task_file/images.php b/app/Template/task_file/images.php
index 835f5cd94..679b06e43 100644
--- a/app/Template/task_file/images.php
+++ b/app/Template/task_file/images.php
@@ -7,9 +7,9 @@
                     'image' => $file,
                     'regex' => 'FILE_ID',
                     'url' => array(
-                        'image' => $this->url->to('FileViewerController', 'image', array('file_id' => 'FILE_ID', 'project_id' => $task['project_id'], 'task_id' => $task['id'])),
-                        'thumbnail' => $this->url->to('FileViewerController', 'thumbnail', array('file_id' => 'FILE_ID', 'project_id' => $task['project_id'], 'task_id' => $task['id'])),
-                        'download' => $this->url->to('FileViewerController', 'download', array('file_id' => 'FILE_ID', 'project_id' => $task['project_id'], 'task_id' => $task['id'])),
+                        'image' => $this->url->to('FileViewerController', 'image', array('file_id' => 'FILE_ID', 'task_id' => $task['id'])),
+                        'thumbnail' => $this->url->to('FileViewerController', 'thumbnail', array('file_id' => 'FILE_ID', 'task_id' => $task['id'])),
+                        'download' => $this->url->to('FileViewerController', 'download', array('file_id' => 'FILE_ID', 'task_id' => $task['id'])),
                     )
                 )) ?>
 
@@ -19,14 +19,14 @@
                             <a href="#" class="dropdown-menu dropdown-menu-link-text" title="<?= $this->text->e($file['name']) ?>"><?= $this->text->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
                             <ul>
                                 <li>
-                                    <?= $this->url->icon('external-link', t('View file'), 'FileViewerController', 'image', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, '', '', true) ?>
+                                    <?= $this->url->icon('external-link', t('View file'), 'FileViewerController', 'image', array('task_id' => $task['id'], 'file_id' => $file['id']), false, '', '', true) ?>
                                 </li>
                                 <li>
-                                    <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                                 </li>
                                 <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                     <li>
-                                        <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                        <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'file_id' => $file['id'])) ?>
                                     </li>
                                 <?php endif ?>
                                 <?= $this->hook->render('template:task-file:images:dropdown', array('task' => $task, 'file' => $file)) ?>
diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
index e7ffe5608..351a09e78 100644
--- a/app/Template/task_file/remove.php
+++ b/app/Template/task_file/remove.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskFileController',
         'remove',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])
+        array('task_id' => $task['id'], 'file_id' => $file['id'])
     ) ?>
 </div>
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
index dad8c2332..4abe8bfdb 100644
--- a/app/Template/task_file/screenshot.php
+++ b/app/Template/task_file/screenshot.php
@@ -6,7 +6,7 @@
     <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p>
 </div>
 
-<form action="<?= $this->url->href('TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
+<form action="<?= $this->url->href('TaskFileController', 'screenshot', array('task_id' => $task['id'])) ?>" method="post">
     <?= $this->form->csrf() ?>
     <?= $this->app->component('screenshot') ?>
     <?= $this->modal->submitButtons() ?>
diff --git a/app/Template/task_internal_link/create.php b/app/Template/task_internal_link/create.php
index bab412537..1f0e4c3f7 100644
--- a/app/Template/task_internal_link/create.php
+++ b/app/Template/task_internal_link/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskInternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskInternalLinkController', 'save', array('task_id' => $task['id'])) ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('opposite_task_id', $values) ?>
diff --git a/app/Template/task_internal_link/edit.php b/app/Template/task_internal_link/edit.php
index fab84d0b6..81b01917b 100644
--- a/app/Template/task_internal_link/edit.php
+++ b/app/Template/task_internal_link/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskInternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskInternalLinkController', 'update', array('task_id' => $task['id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->hidden('opposite_task_id', $values) ?>
diff --git a/app/Template/task_internal_link/remove.php b/app/Template/task_internal_link/remove.php
index f8d91a818..d331679aa 100644
--- a/app/Template/task_internal_link/remove.php
+++ b/app/Template/task_internal_link/remove.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskInternalLinkController',
         'remove',
-        array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])
+        array('link_id' => $link['id'], 'task_id' => $task['id'])
     ) ?>
 </div>
diff --git a/app/Template/task_internal_link/table.php b/app/Template/task_internal_link/table.php
index 0fc10cb18..ac6fc22d9 100644
--- a/app/Template/task_internal_link/table.php
+++ b/app/Template/task_internal_link/table.php
@@ -32,10 +32,10 @@
                             <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
                             <ul>
                                 <li>
-                                    <?= $this->modal->medium('edit', t('Edit'), 'TaskInternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                                    <?= $this->modal->medium('edit', t('Edit'), 'TaskInternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'])) ?>
                                 </li>
                                 <li>
-                                    <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskInternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                                    <?= $this->modal->confirm('trash-o', t('Remove'), 'TaskInternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'])) ?>
                                 </li>
                             </ul>
                         </div>
diff --git a/app/Template/task_list/task_avatars.php b/app/Template/task_list/task_avatars.php
index 143fd8eab..d82460ffe 100644
--- a/app/Template/task_list/task_avatars.php
+++ b/app/Template/task_list/task_avatars.php
@@ -3,7 +3,7 @@
         <span
             <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
             class="task-board-change-assignee"
-            data-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+            data-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'])) ?>">
         <?php else: ?>
             class="task-board-assignee">
         <?php endif ?>
diff --git a/app/Template/task_list/task_details.php b/app/Template/task_list/task_details.php
index 03e1d3eb2..ad2eb23f4 100644
--- a/app/Template/task_list/task_details.php
+++ b/app/Template/task_list/task_details.php
@@ -10,7 +10,7 @@
                     $this->text->e($task['category_name']),
                     'TaskModificationController',
                     'edit',
-                    array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+                    array('task_id' => $task['id']),
                     false,
                     'js-modal-medium' . (! empty($task['category_description']) ? ' tooltip' : ''),
                     t('Change category')
diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php
index c92afe249..97abcb048 100644
--- a/app/Template/task_list/task_icons.php
+++ b/app/Template/task_list/task_icons.php
@@ -44,27 +44,27 @@
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90 fa-inverse"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-refresh fa-rotate-90 fa-inverse"></i>', $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if (! empty($task['nb_links'])): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-code-fork fa-fw"></i>'.$task['nb_links'], $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-code-fork fa-fw"></i>'.$task['nb_links'], $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if (! empty($task['nb_external_links'])): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-external-link fa-fw"></i>'.$task['nb_external_links'], $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-external-link fa-fw"></i>'.$task['nb_external_links'], $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if (! empty($task['nb_subtasks'])): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-bars fa-fw"></i>'.round($task['nb_completed_subtasks'] / $task['nb_subtasks'] * 100, 0).'%', $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-bars fa-fw"></i>'.round($task['nb_completed_subtasks'] / $task['nb_subtasks'] * 100, 0).'%', $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if (! empty($task['nb_files'])): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-paperclip fa-fw"></i>'.$task['nb_files'], $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-paperclip fa-fw"></i>'.$task['nb_files'], $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <?php if ($task['nb_comments'] > 0): ?>
@@ -74,7 +74,7 @@
                 $task['nb_comments'],
                 'CommentListController',
                 'show',
-                array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+                array('task_id' => $task['id']),
                 $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments'])
             ) ?>
         <?php else: ?>
@@ -84,7 +84,7 @@
     <?php endif ?>
 
     <?php if (! empty($task['description'])): ?>
-        <?= $this->app->tooltipLink('<i class="fa fa-file-text-o"></i>', $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= $this->app->tooltipLink('<i class="fa fa-file-text-o"></i>', $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id']))) ?>
     <?php endif ?>
 
     <span title="<?= t('Position') ?>">(<span class="ui-helper-hidden-accessible"><?= t('Position') ?> </span><?= $task['position'] ?>)</span>
diff --git a/app/Template/task_list/task_title.php b/app/Template/task_list/task_title.php
index 662ce1e5b..43fdb06e7 100644
--- a/app/Template/task_list/task_title.php
+++ b/app/Template/task_list/task_title.php
@@ -9,6 +9,6 @@
     <?php endif ?>
 
     <span class="table-list-title <?= $task['is_active'] == 0 ? 'status-closed' : '' ?>">
-        <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>
+        <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'])) ?>
     </span>
 </div>
diff --git a/app/Template/task_mail/create.php b/app/Template/task_mail/create.php
index 3985dddfd..813cfdeb0 100644
--- a/app/Template/task_mail/create.php
+++ b/app/Template/task_mail/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= $this->text->e($task['title']) ?> &gt; <?= t('Send by email') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('TaskMailController', 'send', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off" class="js-mail-form">
+<form method="post" action="<?= $this->url->href('TaskMailController', 'send', array('task_id' => $task['id'])) ?>" autocomplete="off" class="js-mail-form">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Email'), 'emails') ?>
diff --git a/app/Template/task_modification/show.php b/app/Template/task_modification/show.php
index 7adc4ca1d..1b6ffaa47 100644
--- a/app/Template/task_modification/show.php
+++ b/app/Template/task_modification/show.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= $this->text->e($project['name']) ?> &gt; <?= $this->text->e($task['title']) ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <div class="task-form-container">
diff --git a/app/Template/task_move_position/show.php b/app/Template/task_move_position/show.php
index a7c87e661..35ff2930b 100644
--- a/app/Template/task_move_position/show.php
+++ b/app/Template/task_move_position/show.php
@@ -5,7 +5,7 @@
 <form>
 
 <?= $this->app->component('task-move-position', array(
-    'saveUrl' => $this->url->href('TaskMovePositionController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())),
+    'saveUrl' => $this->url->href('TaskMovePositionController', 'save', array('task_id' => $task['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())),
     'board' => $board,
     'task' => $task,
     'swimlaneLabel' => t('Swimlane'),
diff --git a/app/Template/task_recurrence/edit.php b/app/Template/task_recurrence/edit.php
index 0db27d466..0b1bf260c 100644
--- a/app/Template/task_recurrence/edit.php
+++ b/app/Template/task_recurrence/edit.php
@@ -15,7 +15,7 @@
 
 <?php if ($task['recurrence_status'] != \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?>
 
-    <form method="post" action="<?= $this->url->href('TaskRecurrenceController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form method="post" action="<?= $this->url->href('TaskRecurrenceController', 'update', array('task_id' => $task['id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
 
diff --git a/app/Template/task_recurrence/info.php b/app/Template/task_recurrence/info.php
index cda888395..7c06e3ff7 100644
--- a/app/Template/task_recurrence/info.php
+++ b/app/Template/task_recurrence/info.php
@@ -25,13 +25,13 @@
         <?php if ($task['recurrence_parent']): ?>
         <li>
             <?= t('This task has been created by: ') ?>
-            <?= $this->url->link('#'.$task['recurrence_parent'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link('#'.$task['recurrence_parent'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_parent'])) ?>
         </li>
         <?php endif ?>
         <?php if ($task['recurrence_child']): ?>
         <li>
             <?= t('This task has created this child task: ') ?>
-            <?= $this->url->link('#'.$task['recurrence_child'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link('#'.$task['recurrence_child'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_child'])) ?>
         </li>
         <?php endif ?>
     <?php endif ?>
diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php
index 0bf3c8e3f..dfeba00c1 100644
--- a/app/Template/task_status/close.php
+++ b/app/Template/task_status/close.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskStatusController',
         'close',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes')
+        array('task_id' => $task['id'], 'confirmation' => 'yes')
     ) ?>
 </div>
diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php
index 42765e340..dce28d73f 100644
--- a/app/Template/task_status/open.php
+++ b/app/Template/task_status/open.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskStatusController',
         'open',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes')
+        array('task_id' => $task['id'], 'confirmation' => 'yes')
     ) ?>
 </div>
diff --git a/app/Template/task_suppression/remove.php b/app/Template/task_suppression/remove.php
index 4b0666d8f..06d02117e 100644
--- a/app/Template/task_suppression/remove.php
+++ b/app/Template/task_suppression/remove.php
@@ -10,6 +10,6 @@
     <?= $this->modal->confirmButtons(
         'TaskSuppressionController',
         'remove',
-        array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => $redirect)
+        array('task_id' => $task['id'], 'redirect' => $redirect)
     ) ?>
 </div>
diff --git a/app/Template/user_view/timesheet.php b/app/Template/user_view/timesheet.php
index aeffd2f4b..c78cb0c85 100644
--- a/app/Template/user_view/timesheet.php
+++ b/app/Template/user_view/timesheet.php
@@ -16,8 +16,8 @@
         </tr>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
-            <td><?= $this->url->link($this->text->e($record['task_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
-            <td><?= $this->url->link($this->text->e($record['subtask_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['task_title']), 'TaskViewController', 'show', array('task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['subtask_title']), 'TaskViewController', 'show', array('task_id' => $record['task_id'])) ?></td>
             <td><?= $this->dt->datetime($record['start']) ?></td>
             <td><?= $this->dt->datetime($record['end']) ?></td>
             <td><?= n($record['time_spent']).' '.t('hours') ?></td>