mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
Merge branch 'master' into develop
This commit is contained in:
commit
699d970926
@ -7,8 +7,12 @@ HumHub Changelog
|
|||||||
This release also brings a [security update](https://github.com/yiisoft/yii2/security/advisories/GHSA-699q-wcff-g9mj) of the Yii2 framework. HumHub itself and the modules provided by our offical marketplace are not affected by this bug.
|
This release also brings a [security update](https://github.com/yiisoft/yii2/security/advisories/GHSA-699q-wcff-g9mj) of the Yii2 framework. HumHub itself and the modules provided by our offical marketplace are not affected by this bug.
|
||||||
|
|
||||||
- Fix #4361: Added missing nonce attribute in inline marketplace script
|
- Fix #4361: Added missing nonce attribute in inline marketplace script
|
||||||
|
- Fix #4363: Open file modal throws permission denied for unauthenticated users in guest mode
|
||||||
- Fix #4371: Word break issue in notification dropdown
|
- Fix #4371: Word break issue in notification dropdown
|
||||||
|
- Fix #4355: Fixed error when authclient not providing an id attribute
|
||||||
- Fix #4384: Upgrade to Yii 2.0.38
|
- Fix #4384: Upgrade to Yii 2.0.38
|
||||||
|
- Fix #4403: Space Picker Double HTML Encode
|
||||||
|
- Fix #4385: Tour broken when profile start page is changed
|
||||||
|
|
||||||
|
|
||||||
1.6.3 (September 9, 2020)
|
1.6.3 (September 9, 2020)
|
||||||
|
@ -30,7 +30,7 @@ class ViewController extends \humhub\components\Controller
|
|||||||
return [
|
return [
|
||||||
'acl' => [
|
'acl' => [
|
||||||
'class' => AccessControl::class,
|
'class' => AccessControl::class,
|
||||||
'guestAllowedActions' => ['view']
|
'guestAllowedActions' => ['index']
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ class SpacePickerField extends BasePicker
|
|||||||
*/
|
*/
|
||||||
protected function getItemText($item)
|
protected function getItemText($item)
|
||||||
{
|
{
|
||||||
return Html::encode($item->getDisplayName());
|
return $item->getDisplayName();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -38,10 +38,14 @@ class AuthClientHelpers
|
|||||||
return $authClient->getUser();
|
return $authClient->getUser();
|
||||||
}
|
}
|
||||||
|
|
||||||
$auth = Auth::find()->where(['source' => $authClient->getId(), 'source_id' => $attributes['id']])->one();
|
if (isset($attributes['id'])) {
|
||||||
if ($auth !== null) {
|
$auth = Auth::find()->where(['source' => $authClient->getId(), 'source_id' => $attributes['id']])->one();
|
||||||
return $auth->user;
|
if ($auth !== null) {
|
||||||
|
return $auth->user;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -57,7 +61,7 @@ class AuthClientHelpers
|
|||||||
if ($authClient instanceof interfaces\PrimaryClient) {
|
if ($authClient instanceof interfaces\PrimaryClient) {
|
||||||
$user->auth_mode = $authClient->getId();
|
$user->auth_mode = $authClient->getId();
|
||||||
$user->save();
|
$user->save();
|
||||||
} else {
|
} elseif (isset($attributes['id'])) {
|
||||||
$auth = Auth::findOne(['source' => $authClient->getId(), 'source_id' => $attributes['id']]);
|
$auth = Auth::findOne(['source' => $authClient->getId(), 'source_id' => $attributes['id']]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -70,7 +74,7 @@ class AuthClientHelpers
|
|||||||
|
|
||||||
|
|
||||||
if ($auth === null) {
|
if ($auth === null) {
|
||||||
$auth = new \humhub\modules\user\models\Auth([
|
$auth = new Auth([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'source' => (string)$authClient->getId(),
|
'source' => (string)$authClient->getId(),
|
||||||
'source_id' => (string)$attributes['id'],
|
'source_id' => (string)$attributes['id'],
|
||||||
@ -78,6 +82,8 @@ class AuthClientHelpers
|
|||||||
|
|
||||||
$auth->save();
|
$auth->save();
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
Yii::error('Could not store auth client without given ID attribute. User: ' . $user->displayName . ' (' . $user->id . ')', 'user');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ class UserPickerField extends BasePicker
|
|||||||
*/
|
*/
|
||||||
protected function getItemText($item)
|
protected function getItemText($item)
|
||||||
{
|
{
|
||||||
return Html::encode($item->displayName);
|
return $item->displayName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user