Merge pull request #297 from alleyinteractive/hotfix/support-windows-…

…path Support windows path in validate_file checks
alleyinteractive · Dec 12, 2023 · d29cef4 · d29cef4
2 parents 72e3138 + 8394367
commit d29cef4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/assets.php b/src/assets.php
@@ -16,7 +16,7 @@
  * @return bool        True if the path is valid and the file exists.
  */
 function validate_path( string $path ): bool {
-	return 0 === validate_file( $path ) && file_exists( $path );
+	return ( 0 === validate_file( $path ) || 2 === validate_file( $path ) ) && file_exists( $path );
 }
 
 /**
@@ -119,7 +119,7 @@ function load_scripts(): void {
 
 	if ( ! empty( $files ) ) {
 		foreach ( $files as $path ) {
-			if ( 0 === validate_file( $path ) && file_exists( $path ) ) {
+			if ( validate_path( $path ) ) {
 				require_once $path;  // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.IncludingFile, WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 			}
 		}

diff --git a/src/meta.php b/src/meta.php
@@ -135,9 +135,7 @@ function register_meta_helper(
 function register_post_meta_from_defs(): void {
 	// Ensure the config file exists.
 	$filepath = dirname( __DIR__ ) . '/config/post-meta.json';
-	if ( ! file_exists( $filepath )
-		|| 0 !== validate_file( $filepath )
-	) {
+	if ( ! validate_path( $filepath ) ) {
 		return;
 	}