Merge pull request #390 from ONLYOFFICE/develop

Release/7.5.4
ONLYOFFICE · Sep 23, 2022 · 5801236 · 5801236
2 parents 82b54bc + 8644e5d
commit 5801236
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 7.5.4
+## Changed
+- compatible with ownCloud 10.11
+
 ## 7.5.3
 ## Added
 - Catalan translation

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within ownCloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apl2</licence>
     <author>Ascensio System SIA</author>
-    <version>7.5.3</version>
+    <version>7.5.4</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>
@@ -24,6 +24,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/settings.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/new.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/open.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/open_form.png</screenshot>
     <dependencies>
         <owncloud min-version="10" max-version="10" />
     </dependencies>

diff --git a/lib/documentservice.php b/lib/documentservice.php
@@ -97,7 +97,7 @@ function GetConvertedUri($document_uri, $from_extension, $to_extension, $documen
         $isEndConvert = $responceFromConvertService->EndConvert;
 
         if ($isEndConvert !== null && strtolower($isEndConvert) === "true") {
-            return $responceFromConvertService->FileUrl;
+            return (string)$responceFromConvertService->FileUrl;
         }
 
         return "";

diff --git a/screenshots/icon.png b/screenshots/icon.png
diff --git a/screenshots/main.png b/screenshots/main.png
diff --git a/screenshots/main_small.png b/screenshots/main_small.png
diff --git a/screenshots/new.png b/screenshots/new.png
diff --git a/screenshots/open.png b/screenshots/open.png
diff --git a/screenshots/open_form.png b/screenshots/open_form.png
diff --git a/screenshots/settings.png b/screenshots/settings.png