Fixed admin free join query nesting

3 years ago · c2c1a4d281
parent 71d9077a03
commit c2c1a4d281
1 changed files with 7 additions and 3 deletions
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@ -57,9 +57,13 @@ function admin_free()
                $join->on('UserAngelTypes.user_id', '=', 'users.id')
                    ->where('UserAngelTypes.angeltype_id', '=', $angelType);
            });
-            $query->join('AngelTypes', 'UserAngelTypes.angeltype_id', 'AngelTypes.id')
-                ->whereNotNull('UserAngelTypes.confirm_user_id')
-                ->orWhere('AngelTypes.restricted', '=', '0');
+
+            $query->join('AngelTypes', function ($join) {
+                /** @var JoinClause $join */
+                $join->on('UserAngelTypes.angeltype_id', '=', 'AngelTypes.id')
+                    ->whereNotNull('UserAngelTypes.confirm_user_id')
+                    ->orWhere('AngelTypes.restricted', '=', '0');
+            });
        }

        $users = $query->get();