Merge branch 'epic/onboarding-wizard' into refactor/onboarding-naviga…

…tion
impress-org · Jul 15, 2024 · 1d81bf4 · 1d81bf4
2 parents 11afa2b + 293fa5f
commit 1d81bf4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/assets/src/js/admin/onboarding-wizard/app/steps/addons/style.scss b/assets/src/js/admin/onboarding-wizard/app/steps/addons/style.scss
@@ -58,4 +58,14 @@
             text-align: center;
         }
 	}
+
+        > p {
+            color: #4a5568;
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 1.57;
+            margin: 0;
+            text-align: center;
+        }
+	}
 }
diff --git a/assets/src/js/admin/onboarding-wizard/app/steps/features/style.scss b/assets/src/js/admin/onboarding-wizard/app/steps/features/style.scss
@@ -49,4 +49,14 @@
             text-align: center;
         }
     }
+
+        > p {
+            color: #4a5568;
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 1.57;
+            margin: 0;
+            text-align: center;
+        }
+    }
 }
diff --git a/includes/admin/tools/export/give-export-donations-exporter.php b/includes/admin/tools/export/give-export-donations-exporter.php
@@ -646,6 +646,7 @@ public function get_percentage_complete() {
 	 * @access public
 	 *
 	 * @since  2.1
+	 * @unreleased Use maybe_serialize() for column data (some data are arrays)
 	 *
 	 * @return string|false
 	 */
@@ -663,6 +664,7 @@ public function print_csv_rows() {
 				foreach ( $row as $col_id => $column ) {
 					// Make sure the column is valid
 					if ( array_key_exists( $col_id, $cols ) ) {
+                        $column = maybe_serialize( $column );
 						$row_data .= '"' . $this->escape_csv_cell_data(preg_replace( '/"/', "'", $column )) . '"';
 						$row_data .= $i == count( $cols ) ? '' : ',';
 						$i ++;