fix: flag marking on redirection from onboarding

Author: Soare-Robert-Daniel

includes/admin/feedzy-rss-feeds-admin.php

@@ -1663,7 +1663,20 @@ public function feedzy_dismiss_wizard( $redirect_to_dashboard = true ) {
 		update_option( 'feedzy_fresh_install', $status );
 		delete_option( 'feedzy_wizard_data' );
 		if ( false !== $redirect_to_dashboard ) {
-			wp_safe_redirect( remove_query_arg( array( 'action', 'status' ) ) );
+
+			$cleaned_url = remove_query_arg( array( 'page', 'action', 'status' ) );
+			$parsed_url  = wp_parse_url( $cleaned_url );
+
+			// Default to dashboard if no page is set.
+			if (
+				isset( $parsed_url['path'] ) && 
+				strpos( $parsed_url['path'], '/wp-admin/admin.php' ) !== false && 
+				empty( $parsed_url['query'] )
+			) {
+				$cleaned_url = add_query_arg( 'page', 'feedzy-support', $cleaned_url );
+			}
+		
+			wp_safe_redirect( $cleaned_url );
 			exit;
 		}
 		return true;

includes/layouts/setup-wizard.php

@@ -5,9 +5,9 @@
  * @package Feedzy_Rss_Feeds
  */
 
-$dashboard_url = add_query_arg(
+// Note: It will be redirect to dashboard by `feedzy_dismiss_wizard` action.
+$skip_onboarding_url_callback = add_query_arg(
 	array(
-		'page'   => 'feedzy-support',
 		'action' => 'feedzy_dismiss_wizard',
 		'status' => 0,
 	),
@@ -34,7 +34,7 @@
 				</div>
 			</div>
 			<div class="back-btn">
-				<a href="<?php echo esc_url( $dashboard_url ); ?>" class="btn-link"><span class="dashicons dashicons-arrow-left-alt"></span> <?php esc_html_e( 'Go to dashboard', 'feedzy-rss-feeds' ); ?></a>
+				<a href="<?php echo esc_url( $skip_onboarding_url_callback ); ?>" class="btn-link"><span class="dashicons dashicons-arrow-left-alt"></span> <?php esc_html_e( 'Go to dashboard', 'feedzy-rss-feeds' ); ?></a>
 			</div>
 		</div>
 	</div>