mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-10 10:44:20 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10204] Detect binary file changes in dirs with names containing dots
This commit is contained in:
@@ -177,7 +177,7 @@ class build_package
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Is binary?
|
// Is binary?
|
||||||
if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match))
|
if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9._-]+\/\1 differ/i', $line, $match))
|
||||||
{
|
{
|
||||||
$binary[] = trim($match[1]);
|
$binary[] = trim($match[1]);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user