From 64c47936e35d00eae39e0a0b4d6910bd59c7277e Mon Sep 17 00:00:00 2001
From: Javier Casares <javier@robotstxt.es>
Date: Mon, 2 Mar 2026 14:33:11 +0000
Subject: [PATCH] v1.1.1

---
 changelog.txt                                 | 13 +++++++++++++
 ...ass-robotstxt-mlp2-mlp5-step-preflight.php | 19 +++++++++++++++++++
 readme.txt                                    | 10 ++++++++--
 robotstxt-mlp2-mlp5.php                       |  4 ++--
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 24eb1c0..5ac9d75 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,18 @@
 == Changelog ==
 
+= 1.1.1 =
+
+_Release date: 2026-03-02_
+
+**Fixed**
+
+* Wizard Step 1 (Preflight Checks) incorrectly showed "Original tables still present — rename step not done" after Cleanup (Step 6) dropped backup tables. MLP5's own `mlp_*` tables were matching the legacy MLP2 pattern; they are now suppressed when MLP5 is active. A fully completed wizard no longer triggers the "no tables found" blocking issue either.
+
+**Compatibility**
+
+* WordPress: 6.7 – 6.9
+* PHP: 8.2 – 8.5
+
 = 1.1.0 =
 
 _Release date: 2026-03-02_
diff --git a/includes/class-robotstxt-mlp2-mlp5-step-preflight.php b/includes/class-robotstxt-mlp2-mlp5-step-preflight.php
index fd4f337..83d7852 100644
--- a/includes/class-robotstxt-mlp2-mlp5-step-preflight.php
+++ b/includes/class-robotstxt-mlp2-mlp5-step-preflight.php
@@ -43,6 +43,25 @@ class Robotstxt_Mlp2_Mlp5_Step_Preflight {
 		$original_present = Robotstxt_Mlp2_Mlp5_Table_Preparer::has_original_tables();
 		$mlp5_active      = $mlp5->is_active();
 
+		/*
+		 * Once MLP5 is active it creates its own mlp_* tables, which match the
+		 * same pattern used to detect leftover MLP2 originals. Suppress that
+		 * false positive: if MLP5 is active the rename step was already done.
+		 */
+		if ( $mlp5_active ) {
+			$original_present = false;
+		}
+
+		/*
+		 * After a successful cleanup (Step 6) the backup tables are dropped,
+		 * so $tables_renamed would be false even though everything is fine.
+		 * Treat the wizard-done state as equivalent to "tables were renamed".
+		 */
+		$wizard_done = Robotstxt_Mlp2_Mlp5_Wizard_State::is_step_complete( Robotstxt_Mlp2_Mlp5_Wizard_State::TOTAL_STEPS );
+		if ( $wizard_done ) {
+			$tables_renamed = true;
+		}
+
 		if ( ! $tables_renamed ) {
 			if ( $original_present ) {
 				$issues[] = __( 'MLP2 tables have not been renamed yet. Go back to the plugin status page and click "Rename MLP2 tables".', 'robotstxt-mlp2-mlp5' );
diff --git a/readme.txt b/readme.txt
index 60378aa..b650ae2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@ Contributors: javiercasares, robotstxt
 Tags: multisite, multilingual, multilingualpress, migration, mlp
 Requires at least: 6.7
 Tested up to: 6.9
-Stable tag: 1.1.0
+Stable tag: 1.1.1
 Requires PHP: 8.2
-Version: 1.1.0
+Version: 1.1.1
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.txt
 Network: true
@@ -373,6 +373,12 @@ PHP 8.2 through 8.5. Note that MultilingualPress 2 is not compatible with PHP 8.
 
 == Changelog ==
 
+= 1.1.1 =
+
+_Release date: 2026-03-02_
+
+* Fixed: Wizard Step 1 (Preflight Checks) incorrectly showed "Original tables still present — rename step not done" after Cleanup (Step 6) dropped the backup tables.
+
 = 1.1.0 =
 
 _Release date: 2026-03-02_
diff --git a/robotstxt-mlp2-mlp5.php b/robotstxt-mlp2-mlp5.php
index a4b9f3c..dd15871 100644
--- a/robotstxt-mlp2-mlp5.php
+++ b/robotstxt-mlp2-mlp5.php
@@ -3,7 +3,7 @@
  * Plugin Name: MLP2 to MLP5 (by ROBOTSTXT)
  * Plugin URI:  https://git.robotstxt.es/ROBOTSTXT/robotstxt-mlp2-mlp5
  * Description: Guided, safe, and reversible migration from MultilingualPress 2 to MultilingualPress 5.
- * Version:     1.1.0
+ * Version:     1.1.1
  * Author:      ROBOTSTXT
  * Author URI:  https://git.robotstxt.es/ROBOTSTXT
  * License:     GPL-3.0-or-later
@@ -31,7 +31,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * in the `mlp_migrator_db_version` sitemeta key and runs any pending upgrade
  * routines automatically on the next request after a plugin update.
  */
-define( 'ROBOTSTXT_MLP2_MLP5_VERSION', '1.1.0' );
+define( 'ROBOTSTXT_MLP2_MLP5_VERSION', '1.1.1' );
 define( 'ROBOTSTXT_MLP2_MLP5_DB_VERSION', '1.0' );
 
 require_once __DIR__ . '/includes/class-robotstxt-mlp2-mlp5-logger.php';