From db99f3abda0bdbdc26c5234671ea434c20a622b2 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Tue, 20 Jul 2010 20:48:08 -0700
Subject: [PATCH] fixes

---
 mod/dfrn_request.php      | 1 +
 view/dfrn_req_confirm.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 01f7c64b47..7db61d35b8 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -349,6 +349,7 @@ function dfrn_request_content(&$a) {
 			'$confirm_key' => $confirm_key,
 			'$username' => $a->user['username'], 
 			'$uid' => $_SESSION['uid'],
+			'$nickname' => $a->user['nickname'],
 			'dfrn_rawurl' => $_GET['dfrn_url']
 			));
 		return $o;
diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
index 1914e4c0eb..f053f22af2 100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/dfrn_req_confirm.tpl
@@ -5,7 +5,7 @@ Welcome home $username.
 Please confirm your introduction to $dfrn_url.
 
 </p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$uid" method="post"> 
+<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
 <input type="hidden" name="dfrn_url" value="$dfrn_url" />
 <input type="hidden" name="confirm_key" value="$confirm_key" />
 <input type="hidden" name="localconfirm" value="1" />