From 700f060ca4af2b509f87549949637b9807c202a0 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 23 Jan 2016 10:10:24 +0100
Subject: [PATCH] Test fixes

---
 Controller.php        | 2 +-
 Models/UploadFile.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Controller.php b/Controller.php
index 391cfc6..efa371a 100644
--- a/Controller.php
+++ b/Controller.php
@@ -261,7 +261,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $navView = new NavigationView($this->app, $request, $response);
         $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
         $navView->setNav($nav->getNav());
-        $navView->setLanguage($request->getL11n()->language);
+        $navView->setLanguage($request->getL11n()->getLanguage());
         $navView->setParent($pageId);
 
         return $navView;
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index b79de2d..f2f64e0 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -178,15 +178,14 @@ class UploadFile
                 \mkdir($path, '0655', true);
             }
 
-            if (!move_uploaded_file($f['tmp_name'], $path . '/' . $this->fileName)) {
+            if (!move_uploaded_file($path = $f['tmp_name'], $path . '/' . $this->fileName) || !is_uploaded_file($path)) {
                 // couldn't move
                 $result[$key]['status'] = UploadStatus::NOT_MOVABLE;
 
                 return $result;
             }
 
-            $result[$key]['path'] = $rpath;
-
+            $result[$key]['path']   = $rpath;
             $result[$key]['status'] = UploadStatus::OK;
         }