diff --git a/files_reader/CHANGELOG.md b/files_reader/CHANGELOG.md index 2ec3aaf..35dd301 100644 --- a/files_reader/CHANGELOG.md +++ b/files_reader/CHANGELOG.md @@ -1,5 +1,6 @@ -## UNRELEASED -### +## 1.0.1 - 2017-03-19 +### Fixed + - #35: Internal Server Error: fixed path resolution so app works when NC/OC hosted in subdirectory ## 1.0.0 - 2017-03-15 ### Added diff --git a/files_reader/appinfo/.info.xml.swp b/files_reader/appinfo/.info.xml.swp deleted file mode 100644 index f424b9d..0000000 Binary files a/files_reader/appinfo/.info.xml.swp and /dev/null differ diff --git a/files_reader/appinfo/info.xml b/files_reader/appinfo/info.xml index ffce3cf..c2006e4 100644 --- a/files_reader/appinfo/info.xml +++ b/files_reader/appinfo/info.xml @@ -121,7 +121,7 @@ The same Android device showing a zoomed-in part of a page|![The same Android de [SS18]: https://github.com/Yetangitu/owncloud-apps/blob/master/screenshots/photo_2017-03-15_18-28-56.jpg?raw=true "The same Android device showing a zoomed-in part of a page" ]]> - 1.0.0 + 1.0.1 AGPL Frank de Lange diff --git a/files_reader/lib/Controller/PageController.php b/files_reader/lib/Controller/PageController.php index c9cb52b..76a5747 100644 --- a/files_reader/lib/Controller/PageController.php +++ b/files_reader/lib/Controller/PageController.php @@ -129,7 +129,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(); }