summaryrefslogtreecommitdiff
path: root/wsd
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2020-05-05 15:25:25 +0200
committerJan Holesovsky <kendy@collabora.com>2020-05-05 17:08:30 +0200
commit168b3ed04682c6767d4e85563239f58e2c1e908b (patch)
tree0a5e840676d8df9c2c803efd4eb24b31514b7010 /wsd
parentd03aa27ea7d94c99e8492617449907df21958083 (diff)
nocaps: Fix WOPI load.
Change-Id: I538be45897902e9d8ff63d85b1e486767dacbb2d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93484 Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'wsd')
-rw-r--r--wsd/Storage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index f010894c4..adaaa79fe 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -907,7 +907,10 @@ std::string WopiStorage::loadStorageFileToLocal(const Authorization& auth,
setLoaded(true);
// Now return the jailed path.
- return Poco::Path(getJailPath(), getFileInfo().getFilename()).toString();
+ if (LOOLWSD::NoCapsForKit)
+ return getRootFilePath();
+ else
+ return Poco::Path(getJailPath(), getFileInfo().getFilename()).toString();
}
}
catch (const Poco::Exception& pexc)