Changeset 41928

Timestamp:

10/18/2017 09:27:22 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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

Props Dency, yahil, appchecker.
Fixes #39920.

File:

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

trunk/src/wp-admin/includes/misc.php

@@ -68 +68 @@
     $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;
+            }
         }
     }