|
|
@@ -28,12 +28,11 @@ if (isset($GLOBALS['dbLocation'])) {
|
|
|
}
|
|
|
if ($GLOBALS['docker']) {
|
|
|
$getBranch = file_get_contents(dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'Docker.txt');
|
|
|
- $getBranch = (empty($getBranch)) ? 'v2-master' : $getBranch;
|
|
|
+ $getBranch = (empty($getBranch)) ? 'v2-master' : trim($getBranch);
|
|
|
$GLOBALS['branch'] = $getBranch;
|
|
|
$getCommit = file_get_contents(dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'Github.txt');
|
|
|
$getCommit = (empty($getCommit)) ? 'n/a' : $getCommit;
|
|
|
$GLOBALS['commit'] = $getCommit;
|
|
|
-
|
|
|
}
|
|
|
//Upgrade Check
|
|
|
upgradeCheck();
|