Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/app/Controller/TaskImport.php b/app/Controller/TaskImport.php
index 0e9d2169..460c608c 100644
--- a/app/Controller/TaskImport.php
+++ b/app/Controller/TaskImport.php
@@ -20,7 +20,7 @@ class TaskImport extends Base
     {
         $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('task_import/step1', array(
+        $this->response->html($this->helper->layout->project('task_import/step1', array(
             'project' => $project,
             'values' => $values,
             'errors' => $errors,
@@ -52,9 +52,9 @@ class TaskImport extends Base
         $csv->read($filename, array($this->taskImport, 'import'));
 
         if ($this->taskImport->counter > 0) {
-            $this->session->flash(t('%d task(s) have been imported successfully.', $this->taskImport->counter));
+            $this->flash->success(t('%d task(s) have been imported successfully.', $this->taskImport->counter));
         } else {
-            $this->session->flashError(t('Nothing have been imported!'));
+            $this->flash->failure(t('Nothing have been imported!'));
         }
 
         $this->response->redirect($this->helper->url->to('taskImport', 'step1', array('project_id' => $project['id'])));