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,7 +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' ) );
+			add_filter( 'got_rewrite', function() {
+				return $this->temp_filter_value;
+			} );
 			$this->temp_filter_value = $filter_value;
 		}
 
@@ -40,7 +42,7 @@ public function test_got_mod_rewrite( $expected, $apache_loaded, $filter_value =
 		$this->assertSame( $expected, got_mod_rewrite() );
 
 		if ( null !== $filter_value ) {
-			remove_filter( 'got_rewrite', array( $this, 'filter_got_rewrite' ) );
+			remove_all_filters( 'got_rewrite' );
 			unset( $this->temp_filter_value );
 		}
 	}
@@ -79,13 +81,4 @@ public function data_got_mod_rewrite() {
 	 * @var bool
 	 */
 	private $temp_filter_value;
-
-	/**
-	 * Filter callback for 'got_rewrite'.
-	 *
-	 * @return bool
-	 */
-	public function filter_got_rewrite() {
-		return $this->temp_filter_value;
-	}
 }