Ticket #26829: 26829.diff

wp-admin/includes/misc.php

@@ -71 +71 @@
         {
                 $state = false;
                 foreach ( $markerdata as $markerline ) {
-                        if (strpos($markerline, '# END ' . $marker) !== false)
+                        if ( "# END {$marker}" === $markerline )
                                 $state = false;
                         if ( $state )
                                 $result[] = $markerline;
-                        if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+                        if ( "# BEGIN {$marker}" === $markerline )
                                 $state = true;
                 }
         }
@@ -112 +112 @@
                 if ( $markerdata ) {
                         $state = true;
                         foreach ( $markerdata as $n => $markerline ) {
-                                if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+                                if ( "# BEGIN {$marker}" === $markerline )
                                         $state = false;
                                 if ( $state ) {
                                         if ( $n + 1 < count( $markerdata ) )
@@ -120 +120 @@
                                         else
                                                 fwrite( $f, "{$markerline}" );
                                 }
-                                if (strpos($markerline, '# END ' . $marker) !== false) {
+                                if ( "# END {$marker}" === $markerline ) {
                                         fwrite( $f, "# BEGIN {$marker}\n" );
                                         if ( is_array( $insertion ))
                                                 foreach ( $insertion as $insertline )