From 502d59089b1690c41e7ad1bd95fa45f277181ca8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 6 Jan 2011 23:41:14 -0800
Subject: [PATCH] schema typo

---
 database.sql         | 2 +-
 mod/dfrn_request.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/database.sql b/database.sql
index 4a8350f84f..61cd95e72c 100644
--- a/database.sql
+++ b/database.sql
@@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
   `reason` text NOT NULL,
-  `info` MEDIUMTEXT NOT NULL AFTER `reason`,
+  `info` mediumtext NOT NULL,
   `profile-id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 844fbbf6d0..e25515a5bc 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -452,6 +452,12 @@ function dfrn_request_content(&$a) {
 
 		if(! local_user()) {
 			notice( t("Please login to confirm introduction.") . EOL );
+
+			/* setup the return URL to come back to this page if they use openid */
+
+			$stripped = str_replace('q=','',$a->query_string);
+		    $_SESSION['return_url'] = trim($stripped,'/');
+
 			return login();
 		}