Rewrite Rules: Remove redundant if condition in extract_from_markers().

Props Dency, yahil, appchecker.
Fixes #39920.

git-svn-id: https://develop.svn.wordpress.org/trunk@41928 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2017-10-18 21:27:22 +00:00
parent 6426b0b400
commit 40706838a1

View File

@ -67,20 +67,22 @@ function got_url_rewrite() {
function extract_from_markers( $filename, $marker ) { function extract_from_markers( $filename, $marker ) {
$result = array (); $result = array ();
if (!file_exists( $filename ) ) { if ( ! file_exists( $filename ) ) {
return $result; return $result;
} }
if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) )); $markerdata = explode( "\n", implode( '', file( $filename ) ) );
{
$state = false; $state = false;
foreach ( $markerdata as $markerline ) { foreach ( $markerdata as $markerline ) {
if (strpos($markerline, '# END ' . $marker) !== false) if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
$state = false; $state = false;
if ( $state ) if ( $state ) {
$result[] = $markerline; $result[] = $markerline;
if (strpos($markerline, '# BEGIN ' . $marker) !== false) }
if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
$state = true; $state = true;
}
} }
} }