Merge pull request #7339 from annando/gcontact-update

Restructured Contact/GContact handling
This commit is contained in:
Hypolite Petovan 2019-07-07 13:28:20 -04:00 committed by GitHub
commit 9b8b2b36cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 259 additions and 355 deletions

View file

@ -85,7 +85,7 @@ function redir_init(App $a) {
// When the remote page does support OWA, then we enforce the use of it
$basepath = Contact::getBasepath($contact_url);
if ($basepath == System::baseUrl()) {
if (Strings::compareLink($basepath, System::baseUrl())) {
$use_magic = true;
} else {
$serverret = Network::curl($basepath . '/magic');