Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index a21436db49f32e9418d4657ad59da9b8979e688e..ba17e28b73992b47238fc14ab725a96582172224 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -3,10 +3,9 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-if(! function_exists('ostatus_subscribe_content')) {
-function ostatus_subscribe_content(&$a) {
+function ostatus_subscribe_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -46,7 +45,7 @@ function ostatus_subscribe_content(&$a) {
        $total = sizeof($friends);
 
        if ($counter >= $total) {
-               $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/settings/connectors">';
+               $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/settings/connectors">';
                del_pconfig($uid, "ostatus", "legacy_friends");
                del_pconfig($uid, "ostatus", "legacy_contact");
                $o .= t("Done");
@@ -73,8 +72,7 @@ function ostatus_subscribe_content(&$a) {
 
        $o .= "<p>".t("Keep this window open until done.")."</p>";
 
-       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
+       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
 
        return $o;
 }
-}