diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
| commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
| tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /mod/dfrn_request.php | |
| parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
| parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
| download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'mod/dfrn_request.php')
| -rwxr-xr-x | mod/dfrn_request.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index c2d37dac7..5881b7b51 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -664,8 +664,8 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $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 = 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 communications networks:"); @@ -699,7 +699,7 @@ function dfrn_request_content(&$a) { '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), - '$diasnote' => t('- please share from your own site as noted above'), + '$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$your_address' => t('Your Identity Address:'), '$invite_desc' => $invite_desc, '$emailnet' => $emailnet, |