Dev: Merge remote-tracking branch 'origin/master' into develop

LimeSurvey · Jun 23, 2017 · dfbc4ef · dfbc4ef
2 parents 8a59df4 + fbabb24
commit dfbc4ef
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -16,5 +16,5 @@
 $config['dbversionnumber'] = 292;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = '2660';
+$config['assetsversionnumber'] = '2670';
 return $config;
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -1370,7 +1370,7 @@ public function quexml($iSurveyID)
      */
     private function _exportPrintableHtmls($iSurveyID,$readFile = true){
         $oSurvey = Survey::model()->findByPk($iSurveyID);
-        $assetsDir = Template::getTemplateURL($oSurvey->template);
+        $assetsDir = substr(Template::getTemplateURL($oSurvey->template),1);
         $fullAssetsDir = Template::getTemplatePath($oSurvey->template);
         $aLanguages = $oSurvey->getAllLanguages();
 

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -116,7 +116,7 @@ public function bounceprocessing($iSurveyId)
                 $hostencryption = strtoupper($thissurvey['bounceaccountencryption']);
             }
 
-            list($hostname, $port) = explode(':', $hostname); // deprecated: split(':', $hostname);
+            @list($hostname, $port) = explode(':', $hostname);
 
             if (empty($port))
             {

diff --git a/application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php b/application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php
@@ -57,7 +57,7 @@
 
         $content = $survey->localizedTitle;
         $content .= "<span class='pull-right clearfix'>"
-                        ."<span href='#' class='fa fa-question-circle' onclick='return false;' data-html='true' data-toggle=\"popover\" title=\"".gT("Survey information")."\" data-content='".$tooltips."'>&nbsp;</span>"
+                        ."&nbsp;<span href='#' class='fa fa-question-circle' onclick='return false;' data-html='true' data-toggle=\"popover\" title=\"".gT("Survey information")."\" data-content='".$tooltips."'></span>"
                         ."</span>";
 
         $list .= CHtml::link(

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -35,6 +35,22 @@ Thank you to everyone who helped with this new release!
 CHANGE LOG
 ------------------------------------------------------
 
+Changes from 2.66.0 (build 170619) to 2.67.0 (build 170622) June 22, 2017
+-New feature: Opting out of a survey requires a one-click confirmation (Carsten Schmitz)
+-Fixed issue #12476: Quicktranslation tabs not working (markusfluer)
+-Fixed issue: convertDateTimeFormat gets wrong fromdateformat in survey list (Olle Haerstedt)
+#Updated translation: Catalan by qualitatuvic
+#Updated translation: Chinese (Simplified) by yanglaw
+#Updated translation: French (France) by arnaud21
+#Updated translation: Hungarian by kkd
+#Updated translation: Japanese by nomoto
+#Updated translation: Polish by elissa
+#Updated translation: Polish (Informal) by elissa
+#Updated translation: Portuguese (Brazil) by mauriciofurtado
+#Updated translation: Portuguese (Portugal) by samarta
+#Updated translation: Turkish by kayazeren
+
+
 Changes from 2.65.6 (build 170615) to 2.66.0 (build 170619) June 19, 2017
 -New feature #12468: EM placeholder {SID} in email templates (Denis Chenu)
 -Fixed issue #12101: Placeholder "TOKEN" does not work in Equation question (Denis Chenu)