Merge pull request #6412 from annando/issue-6149

Issue 6149: Making OWA (hopefully) compatible with Hubzilla
This commit is contained in:
Hypolite Petovan
2019-01-08 09:17:05 -05:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -74,7 +74,7 @@ class Magic extends BaseModule
$basepath = $exp[0];
$headers = [];
$headers['Accept'] = 'application/x-dfrn+json';
$headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
// Create a header that is signed with the local users private key.

View File

@@ -86,6 +86,6 @@ class Owa extends BaseModule
}
}
}
System::jsonExit($ret, 'application/x-dfrn+json');
System::jsonExit($ret, 'application/x-zot+json');
}
}