Strategy11 / formidable-forms

classes/models/fields/FrmFieldNumber.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
 
 		//validate the number format
 		if ( ! is_numeric( $args['value'] ) && '' !== $args['value'] ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 
 		// validate number settings
@@ -65,9 +65,9 @@ 
 			if ( $frm_settings->use_html && $maxnum !== '' && $minnum !== '' ) {
 				$value = (float) $args['value'];
 				if ( $value < $minnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
 				} elseif ( $value > $maxnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
 				}
 			}
 
@@ -86,7 +86,7 @@ 
 	 * @param array $args   Validation args.
 	 */
 	private function validate_step( &$errors, $args ) {
-		if ( isset( $errors[ 'field' . $args['id'] ] ) ) {
+		if ( isset( $errors['field' . $args['id']] ) ) {
 			return; // Don't need to check if value is invalid before.
 		}
 
@@ -100,7 +100,7 @@ 
 			return;
 		}
 
-		$errors[ 'field' . $args['id'] ] = sprintf(
+		$errors['field' . $args['id']] = sprintf(
 			// Translators: %1$s: the first nearest value; %2$s: the second nearest value.
 			__( 'Please enter a valid value. Two nearest valid values are %1$s and %2$s', 'formidable' ),
 			floatval( $result[0] ),

classes/views/xml/xml.php

Spacing +4 added lines, -4 removed lines

@@ -18,17 +18,17 @@ 
 
 foreach ( $type as $tb_type ) {
 
-	if ( ! isset( $tables[ $tb_type ] ) ) {
+	if ( ! isset( $tables[$tb_type] ) ) {
 		do_action( 'frm_xml_import_' . $tb_type, $args );
 		continue;
 	}
 
-	if ( ! isset( $records[ $tb_type ] ) ) {
+	if ( ! isset( $records[$tb_type] ) ) {
 		// No records.
 		continue;
 	}
 
-	$item_ids = $records[ $tb_type ];
+	$item_ids = $records[$tb_type];
 
 	if ( in_array( $tb_type, array( 'styles', 'actions' ), true ) ) {
 		include dirname( __FILE__ ) . '/posts_xml.php';
@@ -38,7 +38,7 @@ 
 		include FrmProAppHelper::plugin_path() . '/classes/views/xml/' . $tb_type . '_xml.php';
 	}
 
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
+	unset( $item_ids, $records[$tb_type], $tb_type );
 }
 
 /**

classes/models/FrmApplicationTemplate.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
 		 *
 		 * @param array $keys
 		 */
-		self::$keys             = apply_filters(
+		self::$keys = apply_filters(
 			'frm_application_data_keys',
 			array( 'key', 'name', 'description', 'link', 'categories', 'views', 'forms' )
 		);
@@ -100,17 +100,17 @@ 
 	public function as_js_object() {
 		$application = array();
 		foreach ( self::$keys as $key ) {
-			if ( ! isset( $this->api_data[ $key ] ) ) {
+			if ( ! isset( $this->api_data[$key] ) ) {
 				continue;
 			}
 
-			$value = $this->api_data[ $key ];
+			$value = $this->api_data[$key];
 
 			if ( 'icon' === $key ) {
 				// Icon is an array. The first array item is the image URL.
-				$application[ $key ] = reset( $value );
+				$application[$key] = reset( $value );
 			} elseif ( 'categories' === $key ) {
-				$application[ $key ] = array_values(
+				$application[$key] = array_values(
 					array_filter(
 						$value,
 						function( $category ) {
@@ -129,7 +129,7 @@ 
 					// Strip off the " Template" text at the end of the name as it takes up space.
 					$value = substr( $value, 0, -9 );
 				}
-				$application[ $key ] = $value;
+				$application[$key] = $value;
 			}
 		}
 

classes/models/FrmStyle.php

Spacing +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
 			$this->id     = $new_instance['ID'];
 			// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
-				$all_instances[ $number ] = $new_instance;
+				$all_instances[$number] = $new_instance;
 
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
 				if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
@@ -83,27 +83,27 @@ 
 			$default_settings = $this->get_defaults();
 
 			foreach ( $default_settings as $setting => $default ) {
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = $default;
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = $default;
 				}
 
 				if ( $this->is_color( $setting ) ) {
-					$color_val = $new_instance['post_content'][ $setting ];
+					$color_val = $new_instance['post_content'][$setting];
 					if ( $color_val !== '' && 0 === strpos( $color_val, 'rgb' ) ) {
 						// maybe sanitize if invalid rgba value is entered
 						$this->maybe_sanitize_rgba_value( $color_val );
 					}
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val );
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $color_val );
 				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) )
-					&& ! isset( $new_instance['post_content'][ $setting ] )
+					&& ! isset( $new_instance['post_content'][$setting] )
 					) {
-					$new_instance['post_content'][ $setting ] = 0;
+					$new_instance['post_content'][$setting] = 0;
 				} elseif ( $setting == 'font' ) {
-					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+					$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
 				}
 			}
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
 			$action_ids[] = $this->save( $new_instance );
 
@@ -215,10 +215,10 @@ 
 		$valid_keys         = array_keys( $defaults );
 		$sanitized_settings = array();
 		foreach ( $valid_keys as $key ) {
-			if ( isset( $settings[ $key ] ) ) {
-				$sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] );
+			if ( isset( $settings[$key] ) ) {
+				$sanitized_settings[$key] = sanitize_textarea_field( $settings[$key] );
 			} else {
-				$sanitized_settings[ $key ] = $defaults[ $key ];
+				$sanitized_settings[$key] = $defaults[$key];
 			}
 		}
 		return $sanitized_settings;
@@ -385,13 +385,13 @@ 
 			$style->post_content = $this->override_defaults( $style->post_content );
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-			$styles[ $style->ID ] = $style;
+			$styles[$style->ID] = $style;
 		}
 
 		if ( ! $default_style ) {
 			$default_style = reset( $styles );
 
-			$styles[ $default_style->ID ]->menu_order = 1;
+			$styles[$default_style->ID]->menu_order = 1;
 		}
 
 		return $styles;

classes/models/FrmForm.php

Spacing +21 added lines, -21 removed lines

@@ -209,7 +209,7 @@ 
 			}
 
 			if ( $new_val !== $value ) {
-				$new_values[ $key ] = $new_val;
+				$new_values[$key] = $new_val;
 			}
 		}
 
@@ -240,7 +240,7 @@ 
 
 		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
 			}
 		}
 
@@ -328,15 +328,15 @@ 
 		$existing_keys = array_keys( $values['item_meta'] );
 		foreach ( $all_fields as $fid ) {
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
-				$values['item_meta'][ $fid->id ] = '';
+				$values['item_meta'][$fid->id] = '';
 			}
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
 		}
 		unset( $all_fields );
 
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
 			} else {
 				$field = FrmField::getOne( $field_id );
 			}
@@ -345,7 +345,7 @@ 
 				continue;
 			}
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
 				self::get_settings_page_html( $values, $field );
 
@@ -360,15 +360,15 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
 			}
 
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
 			);
 
 			self::prepare_field_update_values( $field, $values, $new_field );
@@ -430,11 +430,11 @@ 
 	 * Updating the settings page
 	 */
 	private static function get_settings_page_html( $values, &$field ) {
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
 			$prev_opts     = array();
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
 		} elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -460,7 +460,7 @@ 
 		foreach ( $field_cols as $col => $default ) {
 			$default = ( $default === '' ) ? $field->{$col} : $default;
 
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 
 		// Don't save the template option.
@@ -874,8 +874,8 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -904,15 +904,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -938,7 +938,7 @@ 
 			'sdir'     => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -966,7 +966,7 @@ 
 			'keep_post' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -1069,7 +1069,7 @@ 
 		$form = $atts['form'];
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
 
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
 	}
 
 	/**

classes/models/fields/FrmFieldType.php

Spacing +20 added lines, -20 removed lines

@@ -132,8 +132,8 @@ 
 		$field_val = '';
 		if ( is_object( $this->field ) ) {
 			$field_val = $this->field->{$column};
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
-			$field_val = $this->field[ $column ];
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
+			$field_val = $this->field[$column];
 		}
 
 		return $field_val;
@@ -147,7 +147,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -469,7 +469,7 @@ 
 			printf(
 				/* translators: %s: Field type */
 				esc_html__( '%s Options', 'formidable' ),
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
 			);
 			?>
 			<i class="frm_icon_font frm_arrowdown6_icon"></i>
@@ -592,8 +592,8 @@ 
 		$fields = FrmField::field_selection();
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-		if ( isset( $fields[ $this->type ] ) ) {
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
+		if ( isset( $fields[$this->type] ) ) {
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
 		}
 
 		return $name;
@@ -604,7 +604,7 @@ 
 	}
 
 	public function get_default_field_options() {
-		$opts       = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -946,7 +946,7 @@ 
 			}
 		} else {
 			$args['save_array'] = $this->is_readonly_array();
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
 		}
 
 		return $hidden;
@@ -955,7 +955,7 @@ 
 	protected function show_single_hidden( $selected, $args ) {
 		if ( $args['save_array'] ) {
 			$args['field_name'] .= '[]';
-			$id                 = '';
+			$id = '';
 		} else {
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
 		}
@@ -971,8 +971,8 @@ 
 		$selected = $values['field_value'];
 
 		if ( isset( $values['combo_name'] ) ) {
-			$options  = $options[ $values['combo_name'] ];
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
+			$options  = $options[$values['combo_name']];
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
 		}
 
 		$input = $this->select_tag( $values );
@@ -1023,7 +1023,7 @@ 
 	}
 
 	protected function fill_display_field_values( $args = array() ) {
-		$defaults        = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
 			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
@@ -1074,7 +1074,7 @@ 
 			}
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
 			if ( $error_comes_first ) {
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
 			} else {
@@ -1149,11 +1149,11 @@ 
 
 		$field_id = $this->get_field_column( 'id' );
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
-			$frm_validated_unique_values[ $field_id ] = array();
+			$frm_validated_unique_values[$field_id] = array();
 			return false;
 		}
 
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
 		return $already_validated_this_value;
 	}
 
@@ -1178,7 +1178,7 @@ 
 	private function value_validated_as_unique( $value ) {
 		global $frm_validated_unique_values;
 		$field_id                                   = $this->get_field_column( 'id' );
-		$frm_validated_unique_values[ $field_id ][] = $value;
+		$frm_validated_unique_values[$field_id][] = $value;
 	}
 
 	public function get_value_to_save( $value, $atts ) {
@@ -1210,8 +1210,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = implode( $sep, $value );
@@ -1280,8 +1280,8 @@ 
 		$saved_entries = $atts['ids'];
 		$new_value     = array();
 		foreach ( (array) $value as $old_child_id ) {
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
-				$new_value[] = $saved_entries[ $old_child_id ];
+			if ( isset( $saved_entries[$old_child_id] ) ) {
+				$new_value[] = $saved_entries[$old_child_id];
 			}
 		}
 

classes/models/fields/FrmFieldText.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		$max_length = intval( FrmField::get_option( $this->field, 'max' ) );
 
 		if ( $max_length && strlen( $args['value'] ) > $max_length ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 
 		return $errors;

classes/models/FrmEntryValues.php

Spacing +6 added lines, -6 removed lines

@@ -173,12 +173,12 @@ 
 	 * @return array
 	 */
 	private function prepare_array_property( $index, $atts ) {
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
 
-			if ( is_array( $atts[ $index ] ) ) {
-				$property = $atts[ $index ];
+			if ( is_array( $atts[$index] ) ) {
+				$property = $atts[$index];
 			} else {
-				$property = explode( ',', $atts[ $index ] );
+				$property = explode( ',', $atts[$index] );
 			}
 		} else {
 			$property = array();
@@ -252,7 +252,7 @@ 
 			);
 		}
 
-		$ip      = array(
+		$ip = array(
 			'label' => __( 'IP Address', 'formidable' ),
 			'value' => $this->entry->ip,
 		);
@@ -330,6 +330,6 @@ 
 	 * @param stdClass $field
 	 */
 	protected function add_field_values( $field ) {
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
 	}
 }

classes/models/FrmPluginSearch.php

Spacing +7 added lines, -7 removed lines

@@ -75,20 +75,20 @@ 
 			'name'                => sprintf(
 				/* translators: Formidable addon name */
 				esc_html_x( 'Formidable %s', 'Formidable Addon Name', 'formidable' ),
-				$addon_list[ $matching_addon ]['name']
+				$addon_list[$matching_addon]['name']
 			),
-			'addon'               => $addon_list[ $matching_addon ]['slug'],
-			'short_description'   => $addon_list[ $matching_addon ]['excerpt'],
+			'addon'               => $addon_list[$matching_addon]['slug'],
+			'short_description'   => $addon_list[$matching_addon]['excerpt'],
 			'slug'                => self::$slug,
-			'version'             => $addon_list[ $matching_addon ]['version'],
+			'version'             => $addon_list[$matching_addon]['version'],
 		);
 
-		if ( ! empty( $addon_list[ $matching_addon ]['external'] ) ) {
+		if ( ! empty( $addon_list[$matching_addon]['external'] ) ) {
 			unset( $overrides['name'] );
 		}
 
 		// Splice in the base addon data.
-		$inject = array_merge( $inject, $addon_list[ $matching_addon ], $overrides );
+		$inject = array_merge( $inject, $addon_list[$matching_addon], $overrides );
 
 		// Add it to the top of the list.
 		array_unshift( $result->plugins, $inject );
@@ -339,7 +339,7 @@ 
 	 */
 	protected function is_installed( $plugin ) {
 		$all_plugins = FrmAppHelper::get_plugins();
-		return isset( $all_plugins[ $plugin ] );
+		return isset( $all_plugins[$plugin] );
 	}
 
 	/**