mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
MINOR: Fix to SapphireInfo for git-svn checkouts. (from r112962)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114518 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
3e8704c882
commit
fc869c1d86
@ -22,8 +22,11 @@ class SapphireInfo extends Controller {
|
||||
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
|
||||
$sapphireVersion = "trunk";
|
||||
} else {
|
||||
preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
|
||||
$sapphireVersion = $matches[1];
|
||||
if(preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches)) {
|
||||
$sapphireVersion = $matches[1];
|
||||
} else {
|
||||
$sapphireVersion = "unknown";
|
||||
}
|
||||
}
|
||||
|
||||
return $sapphireVersion;
|
||||
|
Loading…
x
Reference in New Issue
Block a user