Changed $a->get_baseurl() to App::get_baseurl()

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 28b508dc0e7b25ee0e9f90a4e6cf72041d022c05..8519f7e82ed616cbf06d618071a1816dcd663c77 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -62,11 +62,7 @@ function profile_init(App &$a) {
        header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-<<<<<<< upstream/develop
        foreach ($dfrn_pages as $dfrn) {
-=======
-       foreach($dfrn_pages as $dfrn) {
->>>>>>> HEAD~65
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
        $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";