Dev: PHP notice if surveyid is invalid

LimeSurvey · Sep 26, 2013 · 5d0ae9a · 5d0ae9a
1 parent 238143d
commit 5d0ae9a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -687,9 +687,9 @@ function _loadRequiredHelpersAndLibraries()
 
     function _loadLimesurveyLang($mvSurveyIdOrBaseLang)
     {
-        if ( is_numeric($mvSurveyIdOrBaseLang))
+        if ( is_numeric($mvSurveyIdOrBaseLang) && Survey::model()->find($mvSurveyIdOrBaseLang))
         {
-            $baselang = Survey::model()->findByPk($mvSurveyIdOrBaseLang)->language;
+            $baselang = Survey::model()->find($mvSurveyIdOrBaseLang)->language;
         }
         elseif (!empty($mvSurveyIdOrBaseLang))
         {