Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index cb2754cc80ce6a8ef218421ec7952ccb00327fed..28736750bdd9638d80b24cf961f431fc7afca291 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -162,7 +162,7 @@ class Profile
                * load/reload current theme info
                */
 
-               $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+               $a->setActiveTemplateEngine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
                $theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
                if (file_exists($theme_info_file)) {
@@ -1056,7 +1056,7 @@ class Profile
                                if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
                                        $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
                                        $serverret = Network::curl($magic_path);
-                                       if (!empty($serverret['success'])) {
+                                       if ($serverret->isSuccess()) {
                                                goaway($magic_path);
                                        }
                                }
@@ -1116,7 +1116,7 @@ class Profile
 
                $a->contact = $arr['visitor'];
 
-               info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name']));
+               info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->getHostName(), $visitor['name']));
 
                logger('OpenWebAuth: auth success from ' . $visitor['addr'], LOGGER_DEBUG);
        }