From f61ee5d6f59272540f22d76f39d72a30d9b65ae3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 1 Sep 2011 18:53:12 -0400
Subject: [PATCH] [feature/extension-manager] Make sure the directory pattern
matches on windows
PHPBB3-10323
---
phpBB/includes/extension/finder.php | 4 ++--
1 file 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 . '#';