Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/6161/head
mokaddem 2020-07-30 09:01:36 +02:00
commit a359cbb858
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 1 additions and 1 deletions

View File

@ -427,8 +427,8 @@ class Tag extends AppModel
public function checkForOverride($tags)
{
$userId = Configure::read('CurrentUserId');
$this->UserSetting = ClassRegistry::init('UserSetting');
if ($this->tagOverrides === false && $userId > 0) {
$this->UserSetting = ClassRegistry::init('UserSetting');
$this->tagOverrides = $this->UserSetting->getTagNumericalValueOverride($userId);
}
foreach ($tags as $k => $tag) {