Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

Conflicts: application/helpers/qanda_helper.php
LimeSurvey · Jul 12, 2013 · 4a2d74d · 4a2d74d
2 parents f26db5a + c817d2e
commit 4a2d74d
Show file tree

Hide file tree

Showing 27 changed files with 2,676 additions and 2,615 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -186,7 +186,7 @@ public function exportresults()
             $data['excesscols'] = $aFieldMap;
 
             //get max number of datasets
-            $iMaximum = Yii::app()->db->createCommand("SELECT count(id) FROM {{survey_".intval($iSurveyID)."}}")->queryScalar();
+            $iMaximum = SurveyDynamic::model($iSurveyID)->getMaxId();
 
             $data['max_datasets'] = $iMaximum;
             $data['surveyid'] = $iSurveyID;