diff options
| author | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
| commit | c95deb48398a23de68a3d438b5fffeaea3f3fa01 (patch) | |
| tree | f9e7d080dd0e32d876cb07409b4f8dc1b550b10b /mod/dfrn_request.php | |
| parent | f03c57007a2a9ec73902acfb2d951528e68e3117 (diff) | |
| parent | 0bf9595ab19f3af772d20a88eac86dc8cf962c3e (diff) | |
| download | volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.gz volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.bz2 volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.zip | |
Merge pull request #134 from simonlnu/master
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
Diffstat (limited to 'mod/dfrn_request.php')
| -rwxr-xr-x | mod/dfrn_request.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index bc159137d..4acb5c9bb 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -43,7 +43,7 @@ function dfrn_request_post(&$a) { return; - if($_POST['cancel']) { + if(x($_POST, 'cancel')) { goaway(z_root()); } @@ -666,7 +666,11 @@ function dfrn_request_content(&$a) { $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), $target_addr) . EOL . EOL; - $page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:"); + $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); + + $emailnet = t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"); + + $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.'); $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), @@ -682,6 +686,8 @@ function dfrn_request_content(&$a) { '$diaspora' => t('Diaspora'), '$diasnote' => t('- please share from your own site as noted above'), '$your_address' => t('Your Identity Address:'), + '$invite_desc' => $invite_desc, + '$emailnet' => $emailnet, '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), '$nickname' => $a->argv[1], |