Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-17 17:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-01-23 10:10:24 +01:00
parent ffd4490c52
commit 700f060ca4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller.php
View File

@ -261,7 +261,7 @@ class Controller extends ModuleAbstract implements WebInterface
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/Backend/mid'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->language); $navView->setLanguage($request->getL11n()->getLanguage());
$navView->setParent($pageId); $navView->setParent($pageId);
return $navView; return $navView;

5
Models/UploadFile.php
View File

@ -178,15 +178,14 @@ class UploadFile
\mkdir($path, '0655', true); \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 // couldn't move
$result[$key]['status'] = UploadStatus::NOT_MOVABLE; $result[$key]['status'] = UploadStatus::NOT_MOVABLE;
return $result; return $result;
} }
$result[$key]['path'] = $rpath; $result[$key]['path'] = $rpath;
$result[$key]['status'] = UploadStatus::OK; $result[$key]['status'] = UploadStatus::OK;
} }