Changes per agh1#7 (comment)

twomice · Mar 21, 2019 · b9525ab · b9525ab
1 parent 43aad02
commit b9525ab
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/civievent-widget.php b/civievent-widget.php
@@ -221,8 +221,7 @@ public function widget( $args, $instance ) {
 		$eventTypeIdParams = $this->buildEventTypeIdParams( $instance );
 		$customFilterParams = $this->validCustomFilterFields( $instance );
 		$returnParams = $this->buildReturnParams( $customDisplay, $customDisplayFields );
-		$filterParams = array_merge_recursive( $defaultParams, $eventTypeIdParams, $customFilterParams, $returnParams );
-
+		$filterParams = array_merge( $defaultParams, $eventTypeIdParams, $customFilterParams, $returnParams );
 		$standardDisplay = empty( $customDisplay );
 
 		try {
@@ -288,7 +287,9 @@ public function widget( $args, $instance ) {
 	 */
 	protected function validCustomDisplayFields ( $instance ) {
 		$fields = $this->getFields();
-		$customDisplay = json_decode( empty( $instance['custom_display'] ) ? '{}' : $instance['custom_display'], true );
+
+    $instanceCustomDisplay = html_entity_decode( empty( $instance['custom_display'] ) ? '{}' : $instance['custom_display'] );
+		$customDisplay = json_decode( $instanceCustomDisplay, true );
 		foreach ( $customDisplay as $name => $fieldAttrs ) {
 			// Make sure only legit fields are sent.
 			if ( empty( $fields[ $name ] ) ) {
@@ -309,7 +310,8 @@ protected function validCustomDisplayFields ( $instance ) {
 	protected function validCustomFilterFields ( $instance ) {
 		$fields = $this->getFields();
 		$allCustomDisplayFields = self::getCustomDisplayTitles();
-		$customFilter = json_decode( empty ( $instance['custom_filter'] ) ? '{}' : $instance['custom_filter'], true );
+    $instanceCustomFilter = html_entity_decode( empty ( $instance['custom_filter'] ) ? '{}' : $instance['custom_filter'] );
+		$customFilter = json_decode( $instanceCustomFilter, true );
 		foreach ( $customFilter as $name => $fieldAttrs ) {
 			// Make sure only legit fields are sent.
 			if ( $name === 'options' ) {