aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_request.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-08 21:06:02 -0700
committerFriendika <info@friendika.com>2011-06-08 21:06:02 -0700
commitdf8ac668b800ecf64ab2c240678eb87b225cb513 (patch)
tree7fcfe4b55fb282dfd95bd8500ad92518c7a4acaa /mod/dfrn_request.php
parenta10abd4860ee2e34b197fd7c1bba295cd35c1a9b (diff)
downloadvolse-hubzilla-df8ac668b800ecf64ab2c240678eb87b225cb513.tar.gz
volse-hubzilla-df8ac668b800ecf64ab2c240678eb87b225cb513.tar.bz2
volse-hubzilla-df8ac668b800ecf64ab2c240678eb87b225cb513.zip
more calendar work, undo strict_privacy flag to use different approach
Diffstat (limited to 'mod/dfrn_request.php')
-rw-r--r--mod/dfrn_request.php8
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'),