Changeset 42213

Timestamp:

11/21/2017 03:46:04 AM (7 years ago)

Author:

dd32

Message:

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

Props stodorovic, SergeyBiryukov.
Merges [42199] to the 4.9 branch.
Fixes #42579. See #39920.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/misc.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/misc.php

@@ -78 +78 @@
         if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
             $state = false;
-            if ( $state ) {
-                $result[] = $markerline;
-            }
-            if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
-                $state = true;
-            }
+        }
+        if ( $state ) {
+            $result[] = $markerline;
+        }
+        if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+            $state = true;
         }
     }