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

merge branch ?charactertitles?

Browse source
This commit is contained in:
oliver 2016-03-26 17:53:08 +01:00
commit d3fae2e551
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/SeminaryController.inc
View file

@ -174,7 +174,11 @@
} }
// Check Achievements // 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 // Add notifications
foreach($achievements as &$achievement) foreach($achievements as &$achievement)

2
controllers/MediaController.inc
View file

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

2
controllers/QrcodesController.inc
View file

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