Prevent some notices at install. MDL-16188 ; merged from 19_STABLE

diff --git a/lib/environmentlib.php b/lib/environmentlib.php
index 825beaf3ad05f3221f990601fe8952de23ea1804..2e68642dca61e242bf84204da9b011ca7e0e65ac 100644 (file)
--- a/lib/environmentlib.php
+++ b/lib/environmentlib.php
@@ -7,7 +7,7 @@
 // Moodle - Modular Object-Oriented Dynamic Learning Environment         //
 //          http://moodle.com                                            //
 //                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
+// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
 //           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
 //                                                                       //
 // This program is free software; you can redistribute it and/or modify  //
@@ -525,7 +525,8 @@ function environment_custom_checks($version) {
     $results = array();
 
 /// Get current Moodle version (release) for later compare
-    $current_version = normalize_version($CFG->release);
+    $release = isset($CFG->release) ? $CFG->release : $version; /// In case $CFG fails (at install) use $version
+    $current_version = normalize_version($release);
 
 /// Get the enviroment version we need
     if (!$data = get_environment_for_version($version)) {