Merge branch 'master' into af/add-discussion-page

Author: afercia

README.md

@@ -16,7 +16,7 @@ See the [Core Trac ticket](https://core.trac.wordpress.org/ticket/39441) for mor
 
 ### Testing the new layout
 
-To test the new layout and markup, visit the Settings > General page in the admin. This is the only page that is currently modified for testing.
+To test the new layout and markup, visit a settings page in the admin. At this point, all settings pages except the Discussion page have been migrated to using the enhanced Settings API.
 
 ### Testing the enhanced Settings API
 

settings-api-enhanced.php

@@ -33,6 +33,34 @@ function sae_replace_options_general() {
 	exit;
 }
 
+/**
+ * Replaces the Settings > Writing screen with the plugin variant.
+ */
+function sae_replace_options_writing() {
+	global $title, $parent_file, $submenu_file;
+
+	// Ensure submenu item is highlighted correctly.
+	$submenu_file = 'options-writing.php';
+
+	require_once SAE_ABSPATH . 'wp-admin/options-writing.php';
+
+	exit;
+}
+
+/**
+ * Replaces the Settings > Reading screen with the plugin variant.
+ */
+function sae_replace_options_reading() {
+	global $title, $parent_file, $submenu_file;
+
+	// Ensure submenu item is highlighted correctly.
+	$submenu_file = 'options-reading.php';
+
+	require_once SAE_ABSPATH . 'wp-admin/options-reading.php';
+
+	exit;
+}
+
 /**
  * Replaces the Settings > Media screen with the plugin variant.
  */
@@ -47,6 +75,20 @@ function sae_replace_options_media() {
 	exit;
 }
 
+/**
+ * Replaces the Settings > Permalink screen with the plugin variant.
+ */
+function sae_replace_options_permalink() {
+	global $title, $parent_file, $submenu_file, $is_nginx, $wp_rewrite;
+
+	// Ensure submenu item is highlighted correctly.
+	$submenu_file = 'options-permalink.php';
+
+	require_once SAE_ABSPATH . 'wp-admin/options-permalink.php';
+
+	exit;
+}
+
 /**
  * Replaces the Settings > Discussion screen with the plugin variant.
  */
@@ -78,7 +120,10 @@ function sae_load() {
 
 	add_action( 'admin_enqueue_scripts', 'sae_enqueue_forms_css' );
 	add_action( 'load-options-general.php', 'sae_replace_options_general' );
+	add_action( 'load-options-writing.php', 'sae_replace_options_writing' );
+	add_action( 'load-options-reading.php', 'sae_replace_options_reading' );
 	add_action( 'load-options-media.php', 'sae_replace_options_media' );
+	add_action( 'load-options-permalink.php', 'sae_replace_options_permalink' );
 	add_action( 'load-options-discussion.php', 'sae_replace_options_discussion' );
 }