Merge pull request #547 from xwp/fix/539-windows-path

emeaguiar · web-flow · commit e02a5b262891 · 2021-02-22T15:36:18.000-06:00
Fix directory separator issue in Windows
diff --git a/php/class-plugin-base.php b/php/class-plugin-base.php
@@ -184,7 +184,7 @@ public function locate_plugin() {
 		}
 
 		$plugin_dir  = dirname( dirname( $file_name ) );
-		$plugin_path = $this->relative_path( $plugin_dir, basename( content_url() ), \DIRECTORY_SEPARATOR );
+		$plugin_path = $this->relative_path( $plugin_dir, basename( content_url() ), '/' );
 
 		$dir_url      = content_url( trailingslashit( $plugin_path ) );
 		$dir_path     = $plugin_dir;

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function locate_plugin() {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`$plugin_dir = dirname( dirname( $file_name ) );`
`187`		`- $plugin_path = $this->relative_path( $plugin_dir, basename( content_url() ), \DIRECTORY_SEPARATOR );`
	`187`	`+ $plugin_path = $this->relative_path( $plugin_dir, basename( content_url() ), '/' );`
`188`	`188`
`189`	`189`	`$dir_url = content_url( trailingslashit( $plugin_path ) );`
`190`	`190`	`$dir_path = $plugin_dir;`