Merge branch 'develop' of github.com:humhub/humhub into develop

This commit is contained in:
buddh4 2019-12-20 17:21:47 +01:00
commit ab4a915a03
2 changed files with 4 additions and 2 deletions

View File

@ -16,6 +16,7 @@ HumHub Change Log (DEVELOP)
- Chng: Removed italic text from summary mail of comment and content activities for better readability
- Fix #3798: DBValidator not working with time value and swedish locale
- Enh #3779: Added `ui.view.getContentTop()` for calculating the top position of the layout content with theme support
- Fix #3704: Public space is not displayed when guest user accesses "Space directory".
1.4.0-beta.2

View File

@ -10,6 +10,7 @@
namespace humhub\modules\space\components;
use humhub\modules\space\models\Membership;
use humhub\modules\space\models\Space;
use humhub\modules\user\components\ActiveQueryUser;
use humhub\modules\user\models\User;
use Yii;
@ -49,11 +50,11 @@ class ActiveQuerySpace extends ActiveQuery
}, Membership::findAll(['user_id' => $user->id]));
$this->andWhere(['OR',
['space.visibility' => 1],
['!=', 'space.visibility', Space::VISIBILITY_NONE],
['IN', 'space.id', $spaceIds]
]);
} else {
$this->andWhere(['space.visibility' => 1]);
$this->andWhere(['space.visibility' => Space::VISIBILITY_ALL]);
}
return $this;
}