merge branch ?charactertitles?

This commit is contained in:
oliver 2016-03-26 17:53:08 +01:00
commit 5998fe29ea
3 changed files with 7 additions and 3 deletions

View file

@ -174,7 +174,11 @@
}
// Check Achievements
$achievements = $this->Achievement->checkAchievements(self::$seminary['id'], self::$character['id'], $checkConditions);
$achievements = $this->Achievement->checkAchievements(
self::$seminary['id'],
self::$character['id'],
$checkConditions
);
// Add notifications
foreach($achievements as &$achievement)

View file

@ -427,7 +427,7 @@
// Get file
$file = $this->getMediaFile(
$media,
\nre\configs\AppConfig::$media['charactergroupquest']
\nre\configs\AppConfig::$media['charactergroupsquest']
);
if(is_null($file)) {
return;

View file

@ -160,7 +160,7 @@
/**
* Action: charactergroupsachievements
*
* Display a QR-code for a Character groups Achievement
* Display a QR-code for a Character groups Achievement.
*
* @throws \nre\exceptions\IdNotFoundException
* @param string $seminaryUrl URL-Title of a Seminary