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

LimeSurvey · Dec 14, 2012 · 038433c · 038433c
2 parents a01d1eb + 818cf9a
commit 038433c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -635,9 +635,9 @@ public function getSurveys_json()
             else
             {
                 $condition = "sid={$rows['sid']} AND language='" . $rows['language'] . "'";
-                $questionsCountResult = Questions::model()->findAll($condition);
+                $questionsCountResult = Questions::model()->count($condition);
 
-                if (count($questionsCountResult) && hasSurveyPermission($rows['sid'], 'surveyactivation', 'update'))
+                if ($questionsCountResult>0 && hasSurveyPermission($rows['sid'], 'surveyactivation', 'update'))
                 {
                     $aSurveyEntry[] = '<!--e--><a href="' . $this->getController()->createUrl('admin/survey/sa/activate/surveyid/' . $rows['sid']) . '"><img src="' . Yii::app()->getConfig('adminimageurl') . 'inactive.png" title="" alt="' . $clang->gT("This survey is currently not active - click here to activate this survey.") . '" /></a>';
                 }