diff options
| author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2017-06-27 15:05:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 15:05:23 +0300 |
| commit | 06143c50c072ec9db8761b2cdb969a33e0b67ea1 (patch) | |
| tree | d6a970b204565f8bc6cbfb3321f28b8deb082347 /controller/editorcontroller.php | |
| parent | bccf921bb1feed32e2f3ccaefd96a75595e8d575 (diff) | |
| parent | 94d3015c2febf12cccf02e09acc84367057fce11 (diff) | |
Merge pull request #86 from ONLYOFFICE/developv1.1.3
Release/1.1.3
Diffstat (limited to 'controller/editorcontroller.php')
| -rw-r--r-- | controller/editorcontroller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index b53c68c..72f3862 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -366,7 +366,7 @@ class EditorController extends Controller { $key = $this->getKey($file); $canEdit = isset($format["edit"]) && $format["edit"]; - $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : NULL); + $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : ""); if (!empty($this->config->GetStorageUrl())) { $callback = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $callback); @@ -383,7 +383,7 @@ class EditorController extends Controller { "editorConfig" => [ "callbackUrl" => $callback, "lang" => \OC::$server->getL10NFactory("")->get("")->getLanguageCode(), - "mode" => ($callback === NULL ? "view" : "edit"), + "mode" => (empty($callback) ? "view" : "edit"), "user" => [ "id" => $userId, "name" => $this->userSession->getUser()->getDisplayName() |