diff options
| author | zottel <github@zottel.net> | 2012-05-01 08:21:12 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-01 08:21:12 +0200 |
| commit | 2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (patch) | |
| tree | 2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17 /mod/profile.php | |
| parent | 43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (diff) | |
| parent | f175af05f92384fab7adb75390a8aa52dc1bd7e1 (diff) | |
| download | volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.gz volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.bz2 volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/profile.php b/mod/profile.php index de1e27248..e9d4ca344 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -32,6 +32,8 @@ function profile_init(&$a) { profile_load($a,$which,$profile); + $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false); + if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />'; } @@ -41,8 +43,8 @@ function profile_init(&$a) { $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']); $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n"; } - - if(! $blocked) { + // site block + if((! $blocked) && (! $userblock)) { $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : ''); $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); if(strlen($keywords)) |