Move 6.2 specific code to the right place (#48023)

WordPress · Feb 14, 2023 · 1e749f0 · 1e749f0
1 parent 5a7f4a2
commit 1e749f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/lib/compat/wordpress-6.2/site-editor.php b/lib/compat/wordpress-6.2/site-editor.php
@@ -22,3 +22,24 @@ function gutenberg_site_editor_unset_homepage_setting( $settings, $context ) {
 	return $settings;
 }
 add_filter( 'block_editor_settings_all', 'gutenberg_site_editor_unset_homepage_setting', 10, 2 );
+
+/**
+ * Overrides the site editor initialization for WordPress 6.2 and cancels the redirection.
+ * The logic of this function is not important, we just need to remove the redirection from core.
+ *
+ * @param string $location Location.
+ *
+ * @return string Updated location.
+ */
+function gutenberg_prevent_site_editor_redirection( $location ) {
+	if ( strpos( $location, 'site-editor.php' ) !== false && strpos( $location, '?' ) !== false ) {
+		return add_query_arg(
+			array( 'postId' => 'none' ),
+			admin_url( 'site-editor.php' )
+		);
+	}
+
+	return $location;
+}
+
+add_filter( 'wp_redirect', 'gutenberg_prevent_site_editor_redirection', 1 );
diff --git a/lib/compat/wordpress-6.3/site-editor.php b/lib/compat/wordpress-6.3/site-editor.php
diff --git a/lib/load.php b/lib/load.php
@@ -91,9 +91,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.2/theme.php';
 require __DIR__ . '/compat/wordpress-6.2/widgets.php';
 
-// WordPress 6.3 compat.
-require __DIR__ . '/compat/wordpress-6.3/site-editor.php';
-
 // Experimental features.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WP 6.0's stopgap handler for Webfonts API.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';