Merge branch 'hotfix-10.8.2' into stable

pixl8 · May 8, 2017 · 3580f88 · 3580f88
2 parents b0095df + de45674
commit 3580f88
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.8.1",
+    "version":"10.8.2",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.8.1",
+    "version":"10.8.2",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.8.1
+preside.version=10.8.2
 ##############################
diff --git a/system/services/formbuilder/FormBuilderService.cfc b/system/services/formbuilder/FormBuilderService.cfc
@@ -856,17 +856,17 @@ component {
 
 		spreadsheetLib.renameSheet( workbook, $translateResource( uri="formbuilder:spreadsheet.main.sheet.title", data=[ formDefinition.name ] ), 1 );
 		for( var i=1; i <= headers.len(); i++ ){
-			spreadsheetLib.setCellValue( workbook, headers[i], 1, i );
+			spreadsheetLib.setCellValue( workbook, headers[i], 1, i, "string" );
 		}
 
 		var row = 1;
 		for( var submission in submissions ) {
 			var column = 4;
 			row++;
-			spreadsheetLib.setCellValue( workbook, submission.id, row, 1 );
-			spreadsheetLib.setCellValue( workbook, DateTimeFormat( submission.datecreated, "yyyy-mm-dd HH:nn:ss" ), row, 2 );
-			spreadsheetLib.setCellValue( workbook, submission.submitted_by, row, 3 );
-			spreadsheetLib.setCellValue( workbook, submission.form_instance, row, 4 );
+			spreadsheetLib.setCellValue( workbook, submission.id, row, 1, "string" );
+			spreadsheetLib.setCellValue( workbook, DateTimeFormat( submission.datecreated, "yyyy-mm-dd HH:nn:ss" ), row, 2, "string" );
+			spreadsheetLib.setCellValue( workbook, submission.submitted_by, row, 3, "string" );
+			spreadsheetLib.setCellValue( workbook, submission.form_instance, row, 4, "string" );
 
 			if ( itemsToRender.len() ) {
 				var data   = DeSerializeJson( submission.submitted_data );
@@ -883,16 +883,16 @@ component {
 
 					for( var i=1; i<=mappedColumns.len(); i++ ) {
 						if ( itemColumns.len() >= i ) {
-							spreadsheetLib.setCellValue( workbook, itemColumns[ i ], row, ++column );
+							spreadsheetLib.setCellValue( workbook, itemColumns[ i ], row, ++column, "string" );
 						} else {
 							spreadsheetLib.setCellValue( workbook, "", row, ++column );
 						}
 					}
 				}
 			}
 
-			spreadsheetLib.setCellValue( workbook, submission.ip_address, row, ++column );
-			spreadsheetLib.setCellValue( workbook, submission.user_agent, row, ++column );
+			spreadsheetLib.setCellValue( workbook, submission.ip_address, row, ++column, "string" );
+			spreadsheetLib.setCellValue( workbook, submission.user_agent, row, ++column, "string" );
 		}
 
 		spreadsheetLib.formatRow( workbook, { bold=true }, 1 );