coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

correct sending mail for character submissions (resolves issue #326)

Browse source
This commit is contained in:
coderkun 2014-06-11 22:36:51 +02:00
commit cc86917c7a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controllers/QuestsController.inc
View file

@ -876,11 +876,11 @@
{ {
$user = $this->Users->getUserById($moderator['user_id']); $user = $this->Users->getUserById($moderator['user_id']);
\hhu\z\Utils::sendMail( \hhu\z\Utils::sendMail(
$moderator['email'], $user['email'],
'charactersubmission', 'charactersubmission',
true, true,
array( array(
$moderator, $user,
$seminary, $seminary,
$questgroup, $questgroup,
$quest, $quest,

4
models/CharactersModel.inc
View file

@ -335,14 +335,14 @@
public function getCharactersWithRole($characterrole) public function getCharactersWithRole($characterrole)
{ {
return $this->db->query( 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 '. 'FROM characters '.
'LEFT JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '. 'LEFT JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '.
'LEFT JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id '. 'LEFT JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id '.
'WHERE characterroles.name = ? '. 'WHERE characterroles.name = ? '.
'ORDER BY name ASC', 'ORDER BY name ASC',
's', 's',
$userrole $characterrole
); );
} }