makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10204] Detect binary file changes in dirs with names containing dots
This commit is contained in:
Andreas Fischer 2011-06-09 12:45:11 +02:00
commit d64ec4f765
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build_helper.php
View file

@ -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]);
} }