Fixed issue: PHP notice : Trying to get property of non-object if sur…

…vey not exist
LimeSurvey · Dec 14, 2012 · 47319a4 · 47319a4
1 parent abb62c5
commit 47319a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1409,7 +1409,7 @@ function getSurveyInfo($surveyid, $languagecode='')
     $thissurvey=false;
 
     // if no language code is set then get the base language one
-    if (!isset($languagecode) || $languagecode=='')
+    if ((!isset($languagecode) || $languagecode=='') && Survey::model()->findByPk($surveyid))
     {
         $languagecode=Survey::model()->findByPk($surveyid)->language;
     }
@@ -7340,7 +7340,7 @@ function getHeader($meta = false)
     {
         $languagecode =  Yii::app()->session['survey_'.$surveyid]['s_lang'];
     }
-    elseif (isset($surveyid) && $surveyid)
+    elseif (isset($surveyid) && $surveyid  && Survey::model()->findByPk($surveyid))
     {
         $languagecode=Survey::model()->findByPk($surveyid)->language;
     }