MDL-28134 General : fixed CFG->branch notice during web/cli installation

This commit is contained in:
Aparup Banerjee 2012-05-10 15:43:52 +08:00
parent ed01233ace
commit ad394588db
2 changed files with 6 additions and 0 deletions

View file

@ -95,6 +95,9 @@ if (!isset($CFG->release)) {
if (!isset($CFG->version)) { if (!isset($CFG->version)) {
$CFG->version = ''; $CFG->version = '';
} }
if (!isset($CFG->branch)) {
$CFG->branch = '';
}
$version = null; $version = null;
$release = null; $release = null;

View file

@ -409,8 +409,11 @@ function install_cli_database(array $options, $interactive) {
$CFG->version = ''; $CFG->version = '';
$CFG->release = ''; $CFG->release = '';
$CFG->branch = '';
$version = null; $version = null;
$release = null; $release = null;
$branch = null;
// read $version and $release // read $version and $release
require($CFG->dirroot.'/version.php'); require($CFG->dirroot.'/version.php');