diff --git a/application/models/SurveymenuEntryData.php b/application/models/SurveymenuEntryData.php index b7518290f47..bb7780887b8 100644 --- a/application/models/SurveymenuEntryData.php +++ b/application/models/SurveymenuEntryData.php @@ -138,13 +138,13 @@ private function _getValueForLinkData($getDataPair) $oTypeObject = Template::model()->findByPk($oSurvey->template); break; case 'questiongroup': - if (isset($_REQUEST['gid'])) { - $oTypeObject = QuestionGroup::model()->getByPk(((int) $_REQUEST['gid'])); + if (App()->getRequest()->getParam('gid')) { + $oTypeObject = QuestionGroup::model()->findByPk(array('gid'=>App()->getRequest()->getParam('gid'),'language'=>App()->getLanguage())); } break; case 'question': - if (isset($_REQUEST['qid'])) { - $oTypeObject = QuestionGroup::model()->getByPk(((int) $_REQUEST['qid'])); + if (App()->getRequest()->getParam('qid')) { + $oTypeObject = QuestionGroup::model()->findByPk(array('gid'=>App()->getRequest()->getParam('qid'),'language'=>App()->getLanguage())); } break; break;