[Libreoffice-commits] online.git: wsd/Storage.cpp

[Jan Holesovsky (via logerrit)]

 wsd/Storage.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 168b3ed04682c6767d4e85563239f58e2c1e908b
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue May 5 15:25:25 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 5 17:08:30 2020 +0200

    nocaps: Fix WOPI load.
    
    Change-Id: I538be45897902e9d8ff63d85b1e486767dacbb2d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93484
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

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)