merge branch ?charactergroupsqueststations?

This commit is contained in:
oliver 2016-01-15 23:01:30 +01:00
commit 538e1aa8b0
75 changed files with 19305 additions and 959 deletions

View file

@ -97,7 +97,7 @@
public function getQuestById($questId)
{
$data = $this->db->query(
'SELECT id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '.
'SELECT id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '.
'FROM charactergroupsquests '.
'WHERE id = ?',
'i',