iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed admin free join query nesting

This commit is contained in:
Igor Scheller 2021-10-04 01:57:43 +02:00 committed by msquare
parent 71d9077a03
commit c2c1a4d281
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/pages/admin_free.php
View File

@ -57,9 +57,13 @@ function admin_free()
$join->on('UserAngelTypes.user_id', '=', 'users.id') $join->on('UserAngelTypes.user_id', '=', 'users.id')
->where('UserAngelTypes.angeltype_id', '=', $angelType); ->where('UserAngelTypes.angeltype_id', '=', $angelType);
}); });
$query->join('AngelTypes', 'UserAngelTypes.angeltype_id', 'AngelTypes.id')
->whereNotNull('UserAngelTypes.confirm_user_id') $query->join('AngelTypes', function ($join) {
->orWhere('AngelTypes.restricted', '=', '0'); /** @var JoinClause $join */
$join->on('UserAngelTypes.angeltype_id', '=', 'AngelTypes.id')
->whereNotNull('UserAngelTypes.confirm_user_id')
->orWhere('AngelTypes.restricted', '=', '0');
});
} }
$users = $query->get(); $users = $query->get();