Dev: removing question text from last visited id question has no text

LimeSurvey · Oct 5, 2015 · 3e114ed · 3e114ed
1 parent 8cd597e
commit 3e114ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/application/controllers/admin/index.php b/application/controllers/admin/index.php
@@ -62,7 +62,10 @@ public function run()
             $sid = $lastquestionsid;
             $qrrow = Question::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $sid, 'language' => $baselang));
 
-            $aData['last_question_name'] = $qrrow['title'].' : '.$qrrow['question'];
+            $aData['last_question_name'] = $qrrow['title']; 
+            if($qrrow['question'])
+                $aData['last_question_name'] .= ' : '.$qrrow['question'];
+
             $aData['last_question_link'] = $this->getController()->createUrl("admin/questions/sa/view/surveyid/$iSurveyID/gid/$gid/qid/$qid");
         }
         else 

diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -356,7 +356,11 @@ public function view($iSurveyID, $gid = null, $qid = null)
             $gid = $lastquestiongroup;
             $qrrow = Question::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang));
 
-            $aData['last_question_name'] = $qrrow['title'].' : '.$qrrow['question'];
+            $aData['last_question_name'] = $qrrow['title']; 
+            if($qrrow['question'])
+                $aData['last_question_name'] .= ' : '.$qrrow['question'];
+
+
             $aData['last_question_link'] = $this->getController()->createUrl("admin/questions/sa/view/surveyid/$iSurveyID/gid/$gid/qid/$qid");
         }
         else