diff options
| author | Felix Favre <gnomus@gnomus.de> | 2014-12-06 19:02:26 +0100 |
|---|---|---|
| committer | Felix Favre <gnomus@gnomus.de> | 2014-12-06 19:02:26 +0100 |
| commit | 2f445eb90c6267a9f1055d1536838d9b3fe12f3b (patch) | |
| tree | e954579afcbd6399fc8e17a4b5354f19e046e00f /includes/model | |
| parent | 3973236f6e4cb76a20fca3b908afd526f293a850 (diff) | |
| parent | 10d7fce163ff28da68b036bd4fae95040fd170a9 (diff) | |
Merge branch 'master' of github.com:engelsystem/engelsystem
Diffstat (limited to 'includes/model')
| -rw-r--r-- | includes/model/UserAngelTypes_model.php | 1 | ||||
| -rw-r--r-- | includes/model/User_model.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php index 4a25d25a..7dcaef7a 100644 --- a/includes/model/UserAngelTypes_model.php +++ b/includes/model/UserAngelTypes_model.php @@ -23,6 +23,7 @@ function User_unconfirmed_AngelTypes($user) { JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` JOIN `UserAngelTypes` as `UnconfirmedMembers` ON `UserAngelTypes`.`angeltype_id`=`UnconfirmedMembers`.`angeltype_id` WHERE `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . " + AND `UserAngelTypes`.`coordinator`=TRUE AND `AngelTypes`.`restricted`=TRUE AND `UnconfirmedMembers`.`confirm_user_id` IS NULL"); } diff --git a/includes/model/User_model.php b/includes/model/User_model.php index 45ed2700..2d2b1afb 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -132,7 +132,7 @@ function User($id) { * @param $id UID */ function mUser_Limit($id) { - $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); if ($user_source === false) return false; if (count($user_source) > 0) |