reverted blank line check src/wp-admin/includes/misc.php

Author: Paul Bearne

src/wp-admin/includes/misc.php

@@ -86,9 +86,7 @@ function extract_from_markers( $filename, $marker ) {
 				continue;
 			}
 
-			if ( '' !== $markerline ) {
-				$result[] = $markerline;
-			}
+			$result[] = $markerline;
 		}
 
 		if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {

tests/phpunit/tests/admin/includes/misc/gotModRewrite.php

@@ -27,8 +27,9 @@ public function test_got_mod_rewrite( $expected, $apache_loaded, $filter_value =
 		// without a framework, we rely on the filter for full control.
 
 		if ( null !== $filter_value ) {
-			add_filter( 'got_rewrite', array( $this, 'filter_got_rewrite' ) );
-			$this->temp_filter_value = $filter_value;
+			add_filter( 'got_rewrite', function() use ( $filter_value ) {
+				return $filter_value;
+			} );
 		}
 
 		// If we are NOT filtering, we need to be aware of the environment.
@@ -38,11 +39,6 @@ public function test_got_mod_rewrite( $expected, $apache_loaded, $filter_value =
 		// we use the filter to simulate the different outcomes of the internal check.
 
 		$this->assertSame( $expected, got_mod_rewrite() );
-
-		if ( null !== $filter_value ) {
-			remove_filter( 'got_rewrite', array( $this, 'filter_got_rewrite' ) );
-			unset( $this->temp_filter_value );
-		}
 	}
 
 	/**
@@ -73,19 +69,4 @@ public function data_got_mod_rewrite() {
 			),
 		);
 	}
-
-	/**
-	 * Temporary property for filter value.
-	 * @var bool
-	 */
-	private $temp_filter_value;
-
-	/**
-	 * Filter callback for 'got_rewrite'.
-	 *
-	 * @return bool
-	 */
-	public function filter_got_rewrite() {
-		return $this->temp_filter_value;
-	}
 }