Skip to content

Commit 6f9402c

Browse files
committed
fixup! Move to more generic way of parsing wopi discovery
1 parent 05893fe commit 6f9402c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/Command/ActivateConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
6565
$this->discoveryManager->refetch();
6666
$this->capabilitiesService->clear();
6767
$capaUrlSrc = $this->wopiParser->getUrlSrc('Capabilities');
68-
if (is_array($capaUrlSrc) && $capaUrlSrc['action'] === 'getinfo') {
68+
if ($capaUrlSrc['action'] === 'getinfo') {
6969
$public_wopi_url = str_replace('/hosting/capabilities', '', $capaUrlSrc['urlsrc']);
7070
if ($public_wopi_url !== null) {
7171
$this->appConfig->setAppValue('public_wopi_url', $public_wopi_url);

lib/Controller/SettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public function setSettings($wopi_url,
195195
$this->capabilitiesService->clear();
196196
try {
197197
$capaUrlSrc = $this->wopiParser->getUrlSrc('Capabilities');
198-
if (is_array($capaUrlSrc) && $capaUrlSrc['action'] === 'getinfo') {
198+
if ($capaUrlSrc['action'] === 'getinfo') {
199199
$public_wopi_url = str_replace('/hosting/capabilities', '', $capaUrlSrc['urlsrc']);
200200
if ($public_wopi_url !== null) {
201201
$this->appConfig->setAppValue('public_wopi_url', $public_wopi_url);

lib/WOPI/Parser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private function getUrlSrcByExtension(string $netZoneName, string $actionExt, $a
224224
$netZoneName, $actionExt, $actionName
225225
));
226226

227-
if (!$result || count($result) === 0) {
227+
if (!$result) {
228228
return null;
229229
}
230230

@@ -237,7 +237,7 @@ private function getUrlSrcByMimetype(string $netZoneName, string $mimetype): ?st
237237
$netZoneName, $mimetype
238238
));
239239

240-
if (!$result || count($result) === 0) {
240+
if (!$result) {
241241
return null;
242242
}
243243

0 commit comments

Comments
 (0)