Simplify should_show_in_menu return condition

ampproject · Aug 29, 2018 · a83a569 · a83a569
1 parent 0e9bf1b
commit a83a569
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/includes/validation/class-amp-invalid-url-post-type.php b/includes/validation/class-amp-invalid-url-post-type.php
@@ -119,10 +119,7 @@ public static function should_show_in_menu() {
 		if ( current_theme_supports( 'amp' ) ) {
 			return true;
 		}
-		if ( 'edit.php' === $pagenow && ( isset( $_GET['post_type'] ) && self::POST_TYPE_SLUG === $_GET['post_type'] ) ) { // WPCS: CSRF OK.
-			return true;
-		}
-		return false;
+		return ( 'edit.php' === $pagenow && ( isset( $_GET['post_type'] ) && self::POST_TYPE_SLUG === $_GET['post_type'] ) ); // WPCS: CSRF OK.
 	}
 
 	/**

diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -172,10 +172,7 @@ public static function should_show_in_menu() {
 		if ( current_theme_supports( 'amp' ) ) {
 			return true;
 		}
-		if ( 'edit-tags.php' === $pagenow && ( isset( $_GET['taxonomy'] ) && self::TAXONOMY_SLUG === $_GET['taxonomy'] ) ) { // WPCS: CSRF OK.
-			return true;
-		}
-		return false;
+		return ( 'edit-tags.php' === $pagenow && ( isset( $_GET['taxonomy'] ) && self::TAXONOMY_SLUG === $_GET['taxonomy'] ) ); // WPCS: CSRF OK.
 	}
 
 	/**