schema typo

diff --git a/database.sql b/database.sql
index 4a8350f84fdf8bf6e30d495e9bcab61b4d5386a0..61cd95e72ca6e4f090b53c48fc6234eb3136cb1e 100644 (file)
--- 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 844fbbf6d01bc0e6318ed8c69c394ff66a1b184c..e25515a5bc8846ac9192afdc0b65276a4c6c3127 100644 (file)
--- 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();
                }