diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-09 10:20:47 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-09 10:20:47 +0200 |
| commit | 7ffd0ee41a70d30cadf18032f655222911304b7c (patch) | |
| tree | 8951d4ac7d5a8b1d27929742890914c8c57c23e0 /mod/dfrn_request.php | |
| parent | 6f9fd92c2eabd1b26182e2f7157f35e44f94dc67 (diff) | |
| parent | 9203b48527050b0b4a17120a95b2b3202842d56d (diff) | |
| download | volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.tar.gz volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.tar.bz2 volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/dfrn_request.php')
| -rw-r--r-- | mod/dfrn_request.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 338dc9cf1..c9811fa60 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -626,11 +626,9 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $prv = get_config('system','strict_privacy'); - $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), - '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''), + '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), '$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), @@ -638,9 +636,9 @@ function dfrn_request_content(&$a) { '$add_note' => t('Add a personal note:'), '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"), '$friendika' => t('Friendika'), - '$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''), + '$statusnet' => t('StatusNet/Federated Social Web'), '$private_net' => t("Private \x28secure\x29 network"), - '$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''), + '$public_net' => t("Public \x28insecure\x29 network"), '$your_address' => t('Your Identity Address:'), '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), |