Merge remote-tracking branch 'origin/Yii' into Yii

LimeSurvey · Jul 20, 2012 · efaa56d · efaa56d
2 parents d527478 + e4887ef
commit efaa56d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -486,7 +486,9 @@ function run($surveyid,$args) {
                         $url = passthruReplace($thissurvey['surveyls_url'], $thissurvey);
                         $url = templatereplace($url);    // TODO - check safety of this - provides access to any replacement value
                         $url = str_replace("{SAVEDID}", $saved_id, $url);               // to activate the SAVEDID in the END URL
-                        $url = str_replace("{TOKEN}", $clienttoken, $url);          // to activate the TOKEN in the END URL
+                        if(isset($clienttoken) && $clienttoken) {
+                            $url = str_replace("{TOKEN}", $clienttoken, $url);          // to activate the TOKEN in the END URL
+                        }
                         $url = str_replace("{SID}", $surveyid, $url);              // to activate the SID in the END URL
                         $url = str_replace("{LANG}", $clang->getlangcode(), $url); // to activate the LANG in the END URL
                         header("Location: {$url}");

diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -3292,11 +3292,13 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                     'sp' => $bShowPieChart
                     );
 
-                    Yii::app()->session['stats'][$rt] = array(
-                    'lbl' => $lbl,
-                    'gdata' => $gdata,
-                    'grawdata' => $grawdata
+                    $stats=Yii::app()->session['stats'];
+                    $stats[$rt]=array(
+                        'lbl' => $lbl,
+                        'gdata' => $gdata,
+                        'grawdata' => $grawdata
                     );
+                    Yii::app()->session['stats'] = $stats;
 
                     if (array_sum($gdata)>0 && $bShowGraph == true)
                     {

diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
@@ -101,6 +101,7 @@ $(document).ready(function(){
         height: "100%",
         width: screen.width-20,
         shrinkToFit: true,
+        ignoreCase: true,
         rowNum: 25,
         editable:true,
         scrollOffset:0,