diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
| commit | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (patch) | |
| tree | 07a1b31339ccd871bb4fbfe73e3f0d4911689795 /mod/profile.php | |
| parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
| parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
| download | volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.gz volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.bz2 volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.zip | |
Merge remote branch 'upstream/master'
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; |