From 2637831d9056862f7c3db718702116ef4652629a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 1 Aug 2011 21:02:25 -0700
Subject: some more zot changes migrating back to f9a mainline

---
 mod/dfrn_request.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mod/dfrn_request.php')

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index c9811fa60..6b9558b86 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -48,7 +48,7 @@ function dfrn_request_post(&$a) {
 
 
 	if($_POST['cancel']) {
-		goaway($a->get_baseurl());
+		goaway(z_root());
 	} 
 
 
@@ -190,7 +190,7 @@ function dfrn_request_post(&$a) {
  		// invalid/bogus request
 
 		notice( t('Unrecoverable protocol error.') . EOL );
-		goaway($a->get_baseurl());
+		goaway(z_root());
 		return; // NOTREACHED
 	}
 
@@ -602,7 +602,7 @@ function dfrn_request_content(&$a) {
 				$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 			}
 			else {
-				$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
+				$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 			}
 		}
 		elseif(x($_GET,'addr')) {
-- 
cgit v1.2.3