diff --git a/Classes/Controller/RecommenderController.php b/Classes/Controller/RecommenderController.php index 5252cc1e4d0ff7fb2a50105356bdbbc95393113c..817fc02c301b5f65810958a61fcea0964e5fabf2 100644 --- a/Classes/Controller/RecommenderController.php +++ b/Classes/Controller/RecommenderController.php @@ -78,8 +78,8 @@ class RecommenderController extends AbstractController $this->view->assign('keywords', $this->getKeywords()); $this->view->assign('languages', $this->getLanguages()); $this->view->assign('subjects', $this->getSubjects()); - $this->view->assign('suggestLanguage', $this->getSuggestLanguage($result)); - $this->view->assign('suggestSubject', $this->getSuggestSubject($result)); + $this->view->assign('suggestLanguage', $this->getSuggestLanguage($result->language)); + $this->view->assign('suggestSubject', $this->getSuggestSubject($result->subject)); $this->view->assign('displayMismatchedResults', filter_var($this->extConfig['displayMismatchedResults'], FILTER_VALIDATE_BOOLEAN)); $this->view->assign('displayMirrorJournals', filter_var($this->extConfig['displayMirrorJournals'], FILTER_VALIDATE_BOOLEAN)); $this->view->assign('isFilterTooStrict', $this->isFilterTooStrict()); @@ -127,14 +127,14 @@ class RecommenderController extends AbstractController /** * Gets the language suggested for results. * - * @param array $result JSON array with results + * @param string $language The code of language in ISO 639 * * @return Language|null */ - private function getSuggestLanguage($result) + private function getSuggestLanguage($language) { - if ($result->language !== NULL) { - return new Language($result->language); + if ($language !== NULL) { + return new Language($language); } } @@ -145,10 +145,10 @@ class RecommenderController extends AbstractController * * @return Subject|null */ - private function getSuggestSubject($result) + private function getSuggestSubject($subject) { - if ($result->subject->code !== NULL) { - return Subject::fromSubject($result->subject); + if ($subject !== NULL && $subject->code !== NULL) { + return Subject::fromSubject($subject); } } diff --git a/Classes/Model/Language.php b/Classes/Model/Language.php index cb7008c2cbcb1fef867a242d317276a30253ae16..d99023367238374b7bdcbc9689d4750c56384754 100644 --- a/Classes/Model/Language.php +++ b/Classes/Model/Language.php @@ -45,7 +45,7 @@ class Language * * @access public * - * @param array $languageCode The code of language in ISO 639 + * @param string $languageCode The code of language in ISO 639 * * @return void */