Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index 0ebda485d023a5cf090aed7138a824538f71e7f1..e14b5f82d93f57e4e56c6516712cff5490e6b1cc 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -4,7 +4,7 @@
 require_once('library/openid.php');
 
 
-function openid_content(&$a) {
+function openid_content(App &$a) {
 
        $noid = get_config('system','no_openid');
        if($noid)
@@ -38,7 +38,7 @@ function openid_content(&$a) {
                                dbesc($authid), dbesc(normalise_openid($authid))
                        );
 
-                       if($r && count($r)) {
+                       if (dbm::is_result($r)) {
 
                                // successful OpenID login
 
@@ -92,7 +92,7 @@ function openid_content(&$a) {
 
                        $args .= '&openid_url=' . notags(trim($authid));
 
-                       goaway($a->get_baseurl() . '/register' . $args);
+                       goaway(App::get_baseurl() . '/register' . $args);
 
                        // NOTREACHED
                }