diff options
| author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-10-20 10:27:09 +0300 |
|---|---|---|
| committer | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-10-20 10:27:09 +0300 |
| commit | 455ef1351a3b67f8476286a746160e1da52c2d2c (patch) | |
| tree | 6cb71b1f8d4ce96b5be24ead944431a9abe5e8c9 | |
| parent | adcd0ed3044ea76ee70be825b1545235144b3e6d (diff) | |
| parent | ce050c05d9c419e2e599cf5f19a351031b76dd1d (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/nc-24
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | lib/appconfig.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index df5f02c..0cd7253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ ## Changed - generate preview by default +- fix editing with federated share +- fix opening file in new tab +- fix watermark for shared file by link +- fix update application ## 7.5.4 ## Changed diff --git a/lib/appconfig.php b/lib/appconfig.php index e73b4ee..47b20b6 100644 --- a/lib/appconfig.php +++ b/lib/appconfig.php @@ -427,7 +427,7 @@ class AppConfig { if (empty($url)) { $url = $this->GetSystemValue($this->_documentserver); } - if ($url !== "/") { + if ($url !== null && $url !== "/") { $url = rtrim($url, "/"); if (strlen($url) > 0) { $url = $url . "/"; |