From 5e0cf1472ef0b019c9d50d61ba944e977e28b104 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 15 Feb 2017 21:06:41 -0500
Subject: Improve PR #3038

---
 app/Controller/ConfigController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/ConfigController.php b/app/Controller/ConfigController.php
index 222549f4..62ae8201 100644
--- a/app/Controller/ConfigController.php
+++ b/app/Controller/ConfigController.php
@@ -207,7 +207,7 @@ class ConfigController extends BaseController
      */
     public function uploadDb()
     {
-        $this->response->html($this->helper->layout->config('config/upload_db', array()));
+        $this->response->html($this->template->render('config/upload_db'));
     }
 
     /**
@@ -215,14 +215,16 @@ class ConfigController extends BaseController
      *
      * @access public
      */
-    public function uploadDbSave()
+    public function saveUploadedDb()
     {
         $filename = $this->request->getFilePath('file');
+
         if (!file_exists($filename) || !$this->configModel->uploadDatabase($filename)) {
-            $this->flash->failure(t('Unable to read your file'));
+            $this->flash->failure(t('Unable to read uploaded file.'));
         } else {
             $this->flash->success(t('Database upload done.'));
         }
+
         $this->response->redirect($this->helper->url->to('ConfigController', 'index'));
     }
 
-- 
cgit v1.2.3