diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index 40b6b575..1d28bef7 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -876,11 +876,11 @@ { $user = $this->Users->getUserById($moderator['user_id']); \hhu\z\Utils::sendMail( - $moderator['email'], + $user['email'], 'charactersubmission', true, array( - $moderator, + $user, $seminary, $questgroup, $quest, diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc index a58d610e..4b861a27 100644 --- a/models/CharactersModel.inc +++ b/models/CharactersModel.inc @@ -335,14 +335,14 @@ public function getCharactersWithRole($characterrole) { return $this->db->query( - 'SELECT characters.id, users.created, users.username, users.url, users.surname, users.prename, users.email '. + 'SELECT characters.id, characters.created, characters.user_id, characters.name, characters.url '. 'FROM characters '. 'LEFT JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '. 'LEFT JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id '. 'WHERE characterroles.name = ? '. 'ORDER BY name ASC', 's', - $userrole + $characterrole ); }