yetangitu/nextcloud-apps
1
0
Fork 0
mirror of https://github.com/Yetangitu/owncloud-apps.git synced 2025-10-02 14:49:17 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into pdfreader

Browse source 
- fix merge conflicts master -> pdfreader
This commit is contained in:
frankdelange 2018-01-18 01:26:39 +01:00
commit 41d5a19252
8 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files_reader/lib/Controller/PageController.php
View file

@ -158,7 +158,7 @@ class PageController extends Controller {
} else {
$filePath = $path;
$fileId = $this->rootFolder->getUserFolder($this->userId)
->get(explode("/", rawurldecode($this->request->get['file']),4)[3])
->get(preg_replace("/.*\/remote.php\/webdav(.*)/", "$1", rawurldecode($this->request->get['file'])))
->getFileInfo()
->getId();
}