diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-01 18:53:12 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 16:15:54 +0200 |
| commit | f61ee5d6f59272540f22d76f39d72a30d9b65ae3 (patch) | |
| tree | 476bd0dc4deac4f0950c3479b27cac9714122a6b | |
| parent | 024a5e710e2e49ab3159bb1d781d388d21d2021d (diff) | |
| download | forums-f61ee5d6f59272540f22d76f39d72a30d9b65ae3.tar forums-f61ee5d6f59272540f22d76f39d72a30d9b65ae3.tar.gz forums-f61ee5d6f59272540f22d76f39d72a30d9b65ae3.tar.bz2 forums-f61ee5d6f59272540f22d76f39d72a30d9b65ae3.tar.xz forums-f61ee5d6f59272540f22d76f39d72a30d9b65ae3.zip | |
[feature/extension-manager] Make sure the directory pattern matches on windows
PHPBB3-10323
| -rw-r--r-- | phpBB/includes/extension/finder.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php index 9a0727a50c..5b04ff776d 100644 --- a/phpBB/includes/extension/finder.php +++ b/phpBB/includes/extension/finder.php @@ -318,11 +318,11 @@ class phpbb_extension_finder } else if ($directory && $directory[0] === '/') { - $directory_pattern = '^' . preg_quote($directory . DIRECTORY_SEPARATOR, '#'); + $directory_pattern = '^' . preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#'); } else { - $directory_pattern = preg_quote(DIRECTORY_SEPARATOR . $directory . DIRECTORY_SEPARATOR, '#'); + $directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#'); } $directory_pattern = '#' . $directory_pattern . '#'; |