diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-04 09:31:12 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-04 09:31:12 +0200 |
| commit | 92156cd8403fa1521ecf3c3f9ed3823c03c73dcd (patch) | |
| tree | 38e7b6573c7162254e56dddcaa1543361ead1dbc /mod/redir.php | |
| parent | b48e82d12ab3d5ea07f9e8410aacb9c3ae842539 (diff) | |
| parent | 9b50b0e16f2046b91cb4c734c56024524d8b178b (diff) | |
| download | volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.tar.gz volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.tar.bz2 volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.zip | |
Merge remote-tracking branch 'friendika-master/master' into iconpopup
Diffstat (limited to 'mod/redir.php')
| -rw-r--r-- | mod/redir.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/redir.php b/mod/redir.php index ac21aa17e..8d0c8f4b3 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -5,6 +5,7 @@ function redir_init(&$a) { if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1]))) goaway($a->get_baseurl()); $cid = $a->argv[1]; + $url = ((x($_GET,'url')) ? $_GET['url'] : ''); $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($cid), @@ -37,8 +38,8 @@ function redir_init(&$a) { ); logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); - + $dest = (($url) ? '&destination_url=' . $url : ''); goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec); + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest ); } |