Ensure rewrite rules are flushed properly when toggling website exper…

…ience
ampproject · Jun 10, 2019 · 6f8a8d8 · 6f8a8d8
1 parent 98efeb0
commit 6f8a8d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/amp.php b/amp.php
@@ -278,7 +278,7 @@ function amp_deactivate() {
 		}
 	}
 
-	flush_rewrite_rules();
+	flush_rewrite_rules( false );
 }
 
 /*

diff --git a/includes/options/class-amp-options-manager.php b/includes/options/class-amp-options-manager.php
@@ -68,7 +68,7 @@ public static function register_settings() {
 	}
 
 	/**
-	 * Flush rewrite rules if the supported_post_types have changed.
+	 * Flush rewrite rules if the supported_post_types or experiences have changed.
 	 *
 	 * @since 0.6.2
 	 *
@@ -80,8 +80,17 @@ public static function maybe_flush_rewrite_rules( $old_options, $new_options ) {
 		$new_post_types = isset( $new_options['supported_post_types'] ) ? $new_options['supported_post_types'] : array();
 		sort( $old_post_types );
 		sort( $new_post_types );
-		if ( $old_post_types !== $new_post_types ) {
-			flush_rewrite_rules( false );
+		$old_experiences = isset( $old_options['experiences'] ) ? $old_options['experiences'] : array();
+		$new_experiences = isset( $new_options['experiences'] ) ? $new_options['experiences'] : array();
+		sort( $old_experiences );
+		sort( $new_experiences );
+		if ( $old_post_types !== $new_post_types || $old_experiences !== $new_experiences ) {
+			if ( self::is_website_experience_enabled() ) {
+				add_rewrite_endpoint( amp_get_slug(), EP_PERMALINK );
+				flush_rewrite_rules( false );
+			} else {
+				amp_deactivate();
+			}
 		}
 	}