X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=821e74672bcee8e2ae42d8b69c49b5f6ce44ec61;hb=bc5935061b674a5503a1a82a458dfaf3317e4c70;hp=158054884b7d4d1c9ad0d0e92c58b880c054d77f;hpb=96bcaf4331153d911dff6d8c7265f1a8f3f01255;p=friendica.git
diff --git a/boot.php b/boot.php
index 158054884b..821e74672b 100644
--- a/boot.php
+++ b/boot.php
@@ -7,9 +7,9 @@ require_once('include/text.php');
require_once("include/pgettext.php");
-define ( 'FRIENDIKA_VERSION', '2.2.1075' );
+define ( 'FRIENDIKA_VERSION', '2.2.1076' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1079 );
+define ( 'DB_UPDATE_VERSION', 1081 );
define ( 'EOL', "
\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -803,8 +803,12 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! (x($a->page,'aside')))
$a->page['aside'] = '';
- $a->page['aside'] .= profile_sidebar($a->profile);
- $a->page['aside'] .= contact_block();
+ $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
+ $a->page['aside'] .= profile_sidebar($a->profile, $block);
+
+ if(! $block)
+ $a->page['aside'] .= contact_block();
return;
}}
@@ -827,7 +831,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! function_exists('profile_sidebar')) {
-function profile_sidebar($profile) {
+function profile_sidebar($profile, $block = 0) {
$a = get_app();
@@ -846,10 +850,9 @@ function profile_sidebar($profile) {
$tabs = '';
- $photo = '