MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [cleanup] Invalid assignment in conditional cleaned up

pull/3551/head
iglocska 2018-08-03 17:30:59 +02:00
parent c6f2d87645
commit 742c1a6cd1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/User.php
View File

@ -996,12 +996,12 @@ class User extends AppModel
{
$fields = array();
$fields = array_merge($fields, array_keys($this->getColumnTypes()));
if (($key = array_search('gpgkey', $fields)) !== false) {
unset($fields[$key]);
}
if (($key = array_search('certif_public', $fields)) !== false) {
unset($fields[$key]);
foreach ($fields as $k => $field) {
if (in_array($field, array('gpgkey', 'certif_public'))) {
unset($fields[$k]);
}
}
$fields = array_values($fields);
$relatedModels = array_keys($this->belongsTo);
foreach ($relatedModels as $relatedModel) {
$fields[] = $relatedModel . '.*';