From ad394588db002e3ef8a0727f960ac93c6e39bf7d Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Thu, 10 May 2012 15:43:52 +0800 Subject: [PATCH] MDL-28134 General : fixed CFG->branch notice during web/cli installation --- admin/index.php | 3 +++ lib/installlib.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/admin/index.php b/admin/index.php index 66f3abbe052..6ef4b206b51 100644 --- a/admin/index.php +++ b/admin/index.php @@ -95,6 +95,9 @@ if (!isset($CFG->release)) { if (!isset($CFG->version)) { $CFG->version = ''; } +if (!isset($CFG->branch)) { + $CFG->branch = ''; +} $version = null; $release = null; diff --git a/lib/installlib.php b/lib/installlib.php index 3fe112b5b40..e652a8c6267 100644 --- a/lib/installlib.php +++ b/lib/installlib.php @@ -409,8 +409,11 @@ function install_cli_database(array $options, $interactive) { $CFG->version = ''; $CFG->release = ''; + $CFG->branch = ''; + $version = null; $release = null; + $branch = null; // read $version and $release require($CFG->dirroot.'/version.php');