Fix invalid call to Survey::getDataOnSurvey

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11923 b72ed6b6-b9f8-46b5-92b4-906544132732

application/controllers/admin/printablesurvey.php

@@ -54,14 +54,13 @@ function index($surveyid, $lang = null)
         // Setting the selected language for printout
         $clang = new limesurvey_lang(array('lang' => $surveyprintlang));
 
+        $desrow = Survey::model()->with('languagesettings')->findByAttributes(array('sid' => $surveyid, 'language' => $surveyprintlang));
 
-        $desrow = Survey::model()->getDataOnSurvey($surveyid,  $surveyprintlang)->read();
-
-        if ($desrow==false || count($desrow)==0)
-        {
-            safe_die('Invalid survey ID');
-        }
+        if (is_null($desrow))
+            $this->getController()->error('Invalid survey ID');
 
+        $desrow = array_merge($desrow->attributes, $desrow->languagesettings->attributes);
+
         //echo '<pre>'.print_r($desrow,true).'</pre>';
         $template = $desrow['template'];
         $welcome = $desrow['surveyls_welcometext'];