From 0f06f9034125feb030da17bdbe77018bdeeb9491 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 18 Oct 2017 21:28:46 +0000
Subject: [PATCH] Rewrite Rules: Remove redundant `if` condition in
 `extract_from_markers()`.

Props Dency, yahil, appchecker.
Fixes #39920.
Built from https://develop.svn.wordpress.org/trunk@41928


git-svn-id: http://core.svn.wordpress.org/trunk@41762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/misc.php | 20 +++++++++++---------
 wp-includes/version.php    |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 5cf0e21f28..7b2301a2a9 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -67,20 +67,22 @@ function got_url_rewrite() {
 function extract_from_markers( $filename, $marker ) {
 	$result = array ();
 
-	if (!file_exists( $filename ) ) {
+	if ( ! file_exists( $filename ) ) {
 		return $result;
 	}
 
-	if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
-	{
-		$state = false;
-		foreach ( $markerdata as $markerline ) {
-			if (strpos($markerline, '# END ' . $marker) !== false)
-				$state = false;
-			if ( $state )
+	$markerdata = explode( "\n", implode( '', file( $filename ) ) );
+
+	$state = false;
+	foreach ( $markerdata as $markerline ) {
+		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
+			$state = false;
+			if ( $state ) {
 				$result[] = $markerline;
-			if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+			}
+			if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
 				$state = true;
+			}
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4d9c785c1f..6b3518823a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta2-41927';
+$wp_version = '4.9-beta2-41928';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.