From 4aa2a379b020326cfb59fec36893f05f29eb58a6 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 26 Mar 2016 16:12:11 +0100 Subject: [PATCH 1/2] fix a few docstrings and formattings --- app/controllers/SeminaryController.inc | 6 +++++- controllers/QrcodesController.inc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/SeminaryController.inc b/app/controllers/SeminaryController.inc index fbaf2cfb..8a766b0b 100644 --- a/app/controllers/SeminaryController.inc +++ b/app/controllers/SeminaryController.inc @@ -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) diff --git a/controllers/QrcodesController.inc b/controllers/QrcodesController.inc index 3598a223..c3838661 100644 --- a/controllers/QrcodesController.inc +++ b/controllers/QrcodesController.inc @@ -129,7 +129,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 From 92ce598ad1428131a1ad06754aa4b805377d53b1 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 26 Mar 2016 16:12:31 +0100 Subject: [PATCH 2/2] fix media config for Character groups quests --- controllers/MediaController.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc index c4ba776b..f80fb5c7 100644 --- a/controllers/MediaController.inc +++ b/controllers/MediaController.inc @@ -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;