diff --git a/include/limesurvey/admin/import_functions.php b/include/limesurvey/admin/import_functions.php index 52e4d7c0..54abcf33 100644 --- a/include/limesurvey/admin/import_functions.php +++ b/include/limesurvey/admin/import_functions.php @@ -1422,12 +1422,12 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe { if (isset($aQIDReplacements[$insertdata['cqid']])) { + $oldcqid = $insertdata['cqid']; //Save for cfield transformation $insertdata['cqid']=$aQIDReplacements[$insertdata['cqid']]; // remap the qid } else continue; // a problem with this answer record -> don't consider list($oldcsid, $oldcgid, $oldqidanscode) = explode("X",$insertdata["cfieldname"],3); - // replace the gid for the new one in the cfieldname(if there is no new gid in the $aGIDReplacements array it means that this condition is orphan -> error, skip this record) if (!isset($aGIDReplacements[$oldcgid])) continue; @@ -1440,11 +1440,11 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe { if (preg_match("/^\+/",$oldcsid)) { - $newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid)); + $newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid)); } else { - $newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid)); + $newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid)); } } else diff --git a/include/limesurvey/admin/printablesurvey.php b/include/limesurvey/admin/printablesurvey.php index abe48d75..8cf7cb57 100644 --- a/include/limesurvey/admin/printablesurvey.php +++ b/include/limesurvey/admin/printablesurvey.php @@ -136,7 +136,7 @@ if(isset($showsgqacode) && $showsgqacode == true) } else { - $surveyname = ""; + $surveyname = $surveyname; } $survey_output = array( @@ -442,7 +442,7 @@ while ($degrow = $degresult->FetchRow()) FROM ".db_table_name("conditions")." WHERE ".db_table_name("conditions").".qid={$deqrow['qid']} AND ".db_table_name("conditions").".scenario={$scenariorow['scenario']} - group by cqid, method, cfieldname, value + group by cqid, method ORDER BY cqid"; $distinctresult=db_execute_assoc($distinctquery); //Loop through each condition for a particular scenario. @@ -493,7 +493,7 @@ while ($degrow = $degresult->FetchRow()) { $explanation .= $clang->gT("Answer was")." "; } - $explanation .= " ".$distinctrow['value']; + $explanation .= " `".$distinctrow['value']."`"; } if(!$distinctrow['cqid']) { // cqid == 0 ==> token attribute match $tokenData = GetTokenFieldsAndNames($surveyid); @@ -531,7 +531,7 @@ while ($degrow = $degresult->FetchRow()) { $explanation .= $clang->gT("is")." "; } - $answer_section = $distinctrow['value']; + $explanation .= " `".$distinctrow['value']."`"; } $conquery="SELECT cid, cqid, q.title,\n" diff --git a/include/limesurvey/admin/scripts/admin_core.js b/include/limesurvey/admin/scripts/admin_core.js index f7751f42..03fd5846 100644 --- a/include/limesurvey/admin/scripts/admin_core.js +++ b/include/limesurvey/admin/scripts/admin_core.js @@ -47,9 +47,7 @@ $(document).ready(function(){ target: 'bottomRight'} }, show: {effect: { length:50}}, - hide: { when: 'mouseout' }, - api: { onRender: function() {$(this.options.hide.when.target).bind('click', this.hide);}} - + hide: { when: 'mouseout' } }); } }); diff --git a/include/limesurvey/admin/statistics_function.php b/include/limesurvey/admin/statistics_function.php index 150f5a03..ae56f521 100644 --- a/include/limesurvey/admin/statistics_function.php +++ b/include/limesurvey/admin/statistics_function.php @@ -79,7 +79,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, //$allfields =""; global $connect, $dbprefix, $clang, $rooturl, $rootdir, $homedir, $homeurl, $tempdir, $tempurl, $scriptname, $imagedir, - $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize; + $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize, $showaggregateddata; $fieldmap=createFieldMap($surveyid, "full"); diff --git a/include/limesurvey/docs/release_notes.txt b/include/limesurvey/docs/release_notes.txt index 545db412..5ee62b83 100644 --- a/include/limesurvey/docs/release_notes.txt +++ b/include/limesurvey/docs/release_notes.txt @@ -78,6 +78,38 @@ HOW TO UPGRADE from a LimeSurvey 1.70(+) version to the latest 1.9x Thank you to everyone who helped with this new release! +Changes from 1.91+ (build 10951) to 1.91+ (build 11018) +#Updated translation : French (b00z00) +#Updated translation: German (c_schmitz) +#Updated translation: German Informal (c_schmitz) +#Updated translation: German informal (c_schmitz) +-Fixed issue: Survey Name not displaying when $showsgqacode is false. (jcleeland) +-Fixed issue: groups of "or"ed conditions were displaying multiple times. Removed additional "group by" entries in initial SQL that was causing the repeated processing of groups. (jcleeland) +-Fixed issue #5426: default