Merge pull request #87 from kasimi/preg-quote

paul999 · web-flow · commit ef657d88cd1d · 2019-03-27T17:16:33.000+01:00
Apply preg_quote() to basedir
diff --git a/src/Tests/Tests/epv_test_validate_languages.php b/src/Tests/Tests/epv_test_validate_languages.php
@@ -58,7 +58,7 @@ public function validateDirectory(array $files)
 
 		foreach ($files as $file)
 		{
-			if (preg_match('#^' . $this->basedir . 'language/([a-z_]+?)/(.+\.php)$#', $file, $matches) === 1)
+			if (preg_match('#^' . preg_quote($this->basedir) . 'language/([a-z_]+?)/(.+\.php)$#', $file, $matches) === 1)
 			{
 				$language = $matches[1]; // language, e.g. "en"
 				$relative_filename = $matches[2]; // file name relative to language's base dir, e.g. "info_acp_ext.php"

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function validateDirectory(array $files)`
`58`	`58`
`59`	`59`	`foreach ($files as $file)`
`60`	`60`	`{`
`61`		`- if (preg_match('#^' . $this->basedir . 'language/([a-z_]+?)/(.+\.php)$#', $file, $matches) === 1)`
	`61`	`+ if (preg_match('#^' . preg_quote($this->basedir) . 'language/([a-z_]+?)/(.+\.php)$#', $file, $matches) === 1)`
`62`	`62`	`{`
`63`	`63`	`$language = $matches[1]; // language, e.g. "en"`
`64`	`64`	`$relative_filename = $matches[2]; // file name relative to language's base dir, e.g. "info_acp_ext.php"`