aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-06 23:41:14 -0800
committerFriendika <info@friendika.com>2011-01-06 23:41:14 -0800
commit502d59089b1690c41e7ad1bd95fa45f277181ca8 (patch)
treeec43036b77e8d7ea472167ae7f47986e325fe009
parentfd1abe1c54d1c5fb6a6fdaf9f6862aece674143a (diff)
downloadvolse-hubzilla-502d59089b1690c41e7ad1bd95fa45f277181ca8.tar.gz
volse-hubzilla-502d59089b1690c41e7ad1bd95fa45f277181ca8.tar.bz2
volse-hubzilla-502d59089b1690c41e7ad1bd95fa45f277181ca8.zip
schema typo
-rw-r--r--database.sql2
-rw-r--r--mod/dfrn_request.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/database.sql b/database.sql
index 4a8350f84..61cd95e72 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 844fbbf6d..e25515a5b 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();
}