Browse files

Merge branch 'w15_MDL-27121_m20_phpreq' of git://github.com/skodak/mo…

…odle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 96506c4 + 23580dd commit f9068e531cc3d89620ec8d72f4cbf8f898523d12 @stronk7 stronk7 committed Apr 10, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 admin/cli/upgrade.php
  2. +1 −1 admin/index.php
  3. +1 −1 lib/installlib.php
View
2 admin/cli/upgrade.php
@@ -94,7 +94,7 @@
$newversion = "$release ($version)";
// test environment first
-if (!check_moodle_environment($version, $environment_results, false, ENV_SELECT_RELEASE)) {
+if (!check_moodle_environment(normalize_version($release), $environment_results, false, ENV_SELECT_RELEASE)) {
$errors = environment_get_errors($environment_results);
cli_heading(get_string('environment', 'admin'));
foreach ($errors as $error) {
View
2 admin/index.php
@@ -152,7 +152,7 @@
echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
require_once($CFG->libdir.'/environmentlib.php');
- if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
+ if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
print_upgrade_reload("index.php?agreelicense=1&lang=$CFG->lang");
} else {
echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
View
2 lib/installlib.php
@@ -529,7 +529,7 @@ function install_cli_database(array $options, $interactive) {
}
// test environment first
- if (!check_moodle_environment($version, $environment_results, false, ENV_SELECT_RELEASE)) {
+ if (!check_moodle_environment(normalize_version($release), $environment_results, false, ENV_SELECT_RELEASE)) {
$errors = environment_get_errors($environment_results);
cli_heading(get_string('environment', 'admin'));
foreach ($errors as $error) {

0 comments on commit f9068e5

Please sign in to comment.