diff options
author | Friendika <info@friendika.com> | 2011-05-25 17:20:41 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-05-25 17:20:41 -0700 |
commit | cd536731c33ea83eaf8f2b2ff4e4dcb1062feca5 (patch) | |
tree | 80d2aca488cc47621ccb001abeb79f0096b5486e /mod | |
parent | b6b2997b435d9e7df6040d208fa0c68503fc1ee9 (diff) | |
download | volse-hubzilla-cd536731c33ea83eaf8f2b2ff4e4dcb1062feca5.tar.gz volse-hubzilla-cd536731c33ea83eaf8f2b2ff4e4dcb1062feca5.tar.bz2 volse-hubzilla-cd536731c33ea83eaf8f2b2ff4e4dcb1062feca5.zip |
minor string update
Diffstat (limited to 'mod')
-rw-r--r-- | mod/dfrn_poll.php | 6 | ||||
-rw-r--r-- | mod/profiles.php | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index ef8469523..7d8568188 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -31,6 +31,12 @@ function dfrn_poll_init(&$a) { killme(); } + $r = q("SELECT `hidewall` FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1", + dbesc($a->argv[1]) + ); + if(count($r) && $r[0]['hidewall']) + killme(); + logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] ); header("Content-type: application/atom+xml"); $o = get_feed_for($a, '', $a->argv[1],$last_update); diff --git a/mod/profiles.php b/mod/profiles.php index b64c1294e..f0821a4f8 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -363,7 +363,7 @@ function profiles_content(&$a) { $opt_tpl = get_markup_template("profile-hide-wall.tpl"); $hide_wall = replace_macros($opt_tpl,array( - '$desc' => t('Hide your messages from unknown viewers of this profile?'), + '$desc' => t('Hide profile details and all your messages from unknown viewers?'), '$yes_str' => t('Yes'), '$no_str' => t('No'), '$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""), |