diff options
| author | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
| commit | 6342b3e0bdd5774857a8fca809994f05e0208d25 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /mod/profile.php | |
| parent | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff) | |
| parent | 9a940786c18c1c2bd772aec93f1828f67dc45667 (diff) | |
| download | volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2 volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/profile.php b/mod/profile.php index de1e27248..69f044e89 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)) @@ -141,6 +143,10 @@ function profile_content(&$a, $update = 0) { return $o; } + + $o .= common_friends_visitor_widget($a->profile['profile_uid']); + + if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner) $o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL; |