Merge branch '2.06lts' of https://github.com/LimeSurvey/LimeSurvey.git …

…into 2.06_SondagesPro # Conflicts: # application/config/version.php
LimeSurvey · Dec 9, 2016 · 8ed783d · 8ed783d
2 parents 4124406 + 6358111
commit 8ed783d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -11,9 +11,9 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-$config['versionnumber'] = "2.6.1 SondagesPro";
+$config['versionnumber'] = "2.6.2 SondagesPro";
 $config['dbversionnumber'] = 184;
-$config['buildnumber'] = '1.1.2';
+$config['buildnumber'] = '1.2.0';
 $config['updatable'] = false;
 
 return $config;
diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php
@@ -174,4 +174,14 @@ public function createAbsoluteUrl($route,$params=array(),$schema='',$ampersand='
         else
             return parent::createAbsoluteUrl($route,$params,$schema,$ampersand);
     }
+
+
+    /**
+     * Loads page states from a hidden input.
+     * @return array the loaded page states
+     */
+    protected function loadPageStates()
+    {
+        return array();
+    }    
 }
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -1171,6 +1171,7 @@ function buildsurveysession($surveyid,$preview=false)
         }
     }
 
+
     //RESET ALL THE SESSION VARIABLES AND START AGAIN
     unset($_SESSION['survey_'.$surveyid]['grouplist']);
     unset($_SESSION['survey_'.$surveyid]['fieldarray']);
@@ -1179,7 +1180,9 @@ function buildsurveysession($surveyid,$preview=false)
     unset($_SESSION['survey_'.$surveyid]['fieldmap-' . $surveyid . '-randMaster']);
     unset($_SESSION['survey_'.$surveyid]['groupReMap']);
     $_SESSION['survey_'.$surveyid]['fieldnamesInfo'] = Array();
-
+    // Generate Session ID
+    Yii:app()->session->regenerateID(true);
+
     // Multi lingual support order : by REQUEST, if not by Token->language else by survey default language
     if (returnGlobal('lang',true))
     {

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -59,6 +59,9 @@ Thank you to everyone who helped with this new release!
 CHANGE LOG
 ------------------------------------------------------
 
+Changes from 2.06LTS (build 161024) to 2.6.2LTS (build 161206) Dez 6, 2016
+-Fixed issue #11606: Date/Time filled does not record the answer (Olle Haerstedt)
+-Fixed issue: [security] Possible session fixation on survey entry with token (Carsten Schmitz)
 
 Changes from 2.06LTS (build 160801) to 2.6.1LTS (build 161024) Oct 24, 2016
 -Fixed issue #11455: MapQuest discontinued their free services (Markus FlÃ¼r)