Commit fc00f770d6bfd1c99a88c3bbc0417deeb50198c4

Authored by Paul Barrett
1 parent 7482ff67

Modified regular expression which checks sql upgrades to recognize folder names …

…containing a '-' and properly escape recognition of '.'

Committed by: Paul Barrett
setup/upgrade/lib/UpgradeItems.inc.php
... ... @@ -335,7 +335,7 @@ class SQLUpgradeItem extends UpgradeItem {
335 335 $phase = 0;
336 336 return array($fromVersion, $toVersion, $description, $phase);
337 337 }
338   - $matched = preg_match('#^([\d.]*)/(?:(\d*)-)?(.*)\.sql$#', $path, $matches);
  338 + $matched = preg_match('#^([\d\.-]*)/(?:(\d*)-)?(.*)\.sql$#', $path, $matches);
339 339 //$matched = preg_match('#^([\d.]*)/(?:(\d*)-)?(.*):(?:(\d*))\.sql$#', $path, $matches);
340 340 if ($matched != 0) {
341 341 $fromVersion = $matches[1];
... ...