Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-13 07:10:00 +01:00
Code Issues Projects Releases Wiki Activity

Rewrite Rules: Correct the logic in extract_from_markers() after [41928].

Browse Source 
Props stodorovic.
Fixes #42579. See #39920.
Built from https://develop.svn.wordpress.org/trunk@42199


git-svn-id: http://core.svn.wordpress.org/trunk@42029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-11-16 13:25:50 +00:00
parent 5749295a59
commit 1a5adcf722
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/misc.php
View File

@ -77,6 +77,7 @@ function extract_from_markers( $filename, $marker ) {
foreach ( $markerdata as $markerline ) { foreach ( $markerdata as $markerline ) {
if ( false !== strpos( $markerline, '# END ' . $marker ) ) { if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
$state = false; $state = false;
}
if ( $state ) { if ( $state ) {
$result[] = $markerline; $result[] = $markerline;
} }
@ -84,7 +85,6 @@ function extract_from_markers( $filename, $marker ) {
$state = true; $state = true;
} }
} }
}
return $result; return $result;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-alpha-42193'; $wp_version = '5.0-alpha-42199';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.