diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
| commit | 2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (patch) | |
| tree | 6935173702da59826d6c7577a927d96a57bc4478 /include/identity.php | |
| parent | 2afdba48f06bb99922c19bf964d8f601c1545166 (diff) | |
| parent | 021584d782c5bfafaa5ffe26d0c5850c8fffdd8f (diff) | |
| download | volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.gz volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.bz2 volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/identity.php b/include/identity.php index 4f58d7dc5..0b9842caf 100644 --- a/include/identity.php +++ b/include/identity.php @@ -484,7 +484,7 @@ function identity_basic_export($channel_id, $items = false) { // use constants here as otherwise we will have no idea if we can import from a site // with a non-standard platform and version. - $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION); + $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => UNO ); $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id) @@ -928,9 +928,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $block = true; } - if($block && intval(get_config('system','block_public_blackout'))) - return $o; - if((! is_array($profile)) && (! count($profile))) return $o; |