Always apply merge hooks in task creation controller

1 files changed, 4 insertions, 16 deletions

diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index cbc3777a..f628e923 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -37,9 +37,12 @@ class TaskModificationController extends BaseController
         $project = $this->projectModel->getById($task['project_id']);
 
         if (empty($values)) {
-            $values = $this->prepareValues($task);
+            $values = $task;
         }
 
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
+
         $this->response->html($this->template->render('task_modification/show', array(
             'project' => $project,
             'values' => $values,
@@ -71,19 +74,4 @@ class TaskModificationController extends BaseController
             $this->edit($values, $errors);
         }
     }
-
-    /**
-     * Prepare form values
-     *
-     * @access protected
-     * @param  array $task
-     * @return array
-     */
-    protected function prepareValues(array $task)
-    {
-        $values = $task;
-        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
-        $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
-        return $values;
-    }
 }