Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/app/Controller/UserImport.php b/app/Controller/UserImport.php
index 32b9a865..debd69e5 100644
--- a/app/Controller/UserImport.php
+++ b/app/Controller/UserImport.php
@@ -18,7 +18,7 @@ class UserImport extends Base
      */
     public function step1(array $values = array(), array $errors = array())
     {
-        $this->response->html($this->template->layout('user_import/step1', array(
+        $this->response->html($this->helper->layout->app('user_import/step1', array(
             'values' => $values,
             'errors' => $errors,
             'max_size' => ini_get('upload_max_filesize'),
@@ -46,9 +46,9 @@ class UserImport extends Base
         $csv->read($filename, array($this->userImport, 'import'));
 
         if ($this->userImport->counter > 0) {
-            $this->session->flash(t('%d user(s) have been imported successfully.', $this->userImport->counter));
+            $this->flash->success(t('%d user(s) have been imported successfully.', $this->userImport->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('userImport', 'step1'));