← All changes | classes/controllers/FrmWelcomeTourController.php +4 -4 6.26 → trunk View file →

		@@ -334,13 +334,15 @@
334	334	);
335	335
336	336	foreach ( $links as $key => $link ) {
337	337	$attrs = $button_attrs + array( 'data-tracking-value' => $key );
	338	+ // phpcs:disable Generic.WhiteSpace.ScopeIndent
338	339	?>
339	340	<a href="<?php echo esc_url( $link['url'] ); ?>" <?php FrmAppHelper::array_to_html_params( $attrs, true ); ?>>
340	341	<?php echo esc_html( $link['text'] ); ?>
341	342	</a>
342	343	<?php
	344	+ // phpcs:enable Generic.WhiteSpace.ScopeIndent
343	345	}
344	346	}
345	347
346	348	/**
		@@ -357,9 +359,8 @@
357	359	$active_step = self::$checklist['active_step_key'];
358	360	$page = FrmAppHelper::simple_get( 'page' );
359	361	$is_form_templates_page = FrmFormTemplatesController::PAGE_SLUG === $page;
360	362	$is_form_builder_page = FrmAppHelper::is_form_builder_page();
361		- $is_style_editor_page = FrmAppHelper::is_style_editor_page();
362	363
363	364	switch ( $active_step ) {
364	365	case 'create-form':
365	366	return $is_form_templates_page;
		@@ -367,9 +368,9 @@
367	368	return $is_form_builder_page;
368	369	case 'style-form':
369	370	case 'embed-form':
370	371	case 'completed':
371		- return $is_form_builder_page || $is_style_editor_page;
	372	+ return $is_form_builder_page || FrmAppHelper::is_style_editor_page();
372	373	default:
373	374	return false;
374	375	}
375	376	}
		@@ -619,11 +620,10 @@
619	620	return array();
620	621	}
621	622
622	623	$usage_data = array();
623		- $steps = self::get_steps();
624	624
625		- foreach ( $steps as $key => $step ) {
	625	+ foreach ( self::get_steps() as $key => $step ) {
626	626	$usage_data[ 'completed_step_' . $key ] = empty( $option['completed_steps'][ $key ] ) ? 0 : 1;
627	627	}
628	628
629	629	$usage_data['done'] = empty( $option['done'] ) ? 0 : 1;