Fixed issue #6932: Clicking browse on text entries returns no results…

… in statistics screen in MSSQL
LimeSurvey · Nov 26, 2012 · 87836a6 · 87836a6
1 parent 7be96fb
commit 87836a6
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
@@ -495,10 +495,20 @@ public function run($surveyid = 0, $subaction = null)
     function listcolumn($surveyid, $column, $sortby="", $sortmethod="", $sorttype="")
     {
         $search['condition']=Yii::app()->db->quoteColumnName($column)." != ''";
+        $sDBDriverName=Yii::app()->db->getDriverName();
+        if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='mssql')
+        {
+            $search['condition']="CAST(".Yii::app()->db->quoteColumnName($column)." as varchar) != ''";
+        }
+
         //Look for any selects/filters set in the original statistics query, and apply them to the column listing
-        foreach(Yii::app()->session['statistics_selects_'.$surveyid] as $sql) {
-             $search['condition'] .= " AND $sql";
+        if (isset(Yii::app()->session['statistics_selects_'.$surveyid]) && is_array(Yii::app()->session['statistics_selects_'.$surveyid]))
+        {
+            foreach(Yii::app()->session['statistics_selects_'.$surveyid] as $sql) {
+                 $search['condition'] .= " AND $sql";
+            }
         }
+
         if($sorttype=='N') {$sortby = "($sortby * 1)";} //Converts text sorting into numerical sorting
         if($sortby != "") $search['order']=$sortby.' '.$sortmethod;
         $results=Survey_dynamic::model($surveyid)->findAll($search);