Note: most #wxyz references are issue numbers you can find in our public bug tracking system. Some references marked BT#xyz are developments made externally for BeezNest customers and integrated into Chamilo. The details of these tasks cannot be seen for confidentiality reasons, but the code change is public and can be reviewed by anyone.
+
Chamilo 1.10.0 is a major version of the 1.10.x branch, with new features and bugfixes on top of 1.9.10. As a major version, it requires the use of the upgrade script in order to upgrade an existing Chamilo portal. See install instructions
+Chamilo 1.9.10 is a new minor version of the 1.9.x branch, with many bugfixes and a few interesting new features (as such, you can just overwrite previous files to upgrade from 1.9.8, 1.9.8.1 or 1.9.8.2 to 1.9.10).
diff --git a/main/install/index.php b/main/install/index.php index 2fb77d01b9..ba8449b1f0 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -111,7 +111,7 @@ error_reporting(E_ALL); // Upgrading from any subversion of 1.6 is just like upgrading from 1.6.5 $update_from_version_6 = array('1.6', '1.6.1', '1.6.2', '1.6.3', '1.6.4', '1.6.5'); // Upgrading from any subversion of 1.8 avoids the additional step of upgrading from 1.6 -$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2','1.9.4','1.9.6', '1.9.6.1'); +$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2','1.9.4','1.9.6', '1.9.6.1', '1.9.8', '1.9.8.1', '1.9.8.2', '1.9.10'); $my_old_version = ''; $tmp_version = get_config_param('dokeos_version'); @@ -861,6 +861,15 @@ if (@$_POST['step2']) { case '1.9.4': case '1.9.6': case '1.9.6.1': + case '1.9.8': + case '1.9.8.1': + case '1.9.8.2': + case '1.9.10': + include 'update-db-1.9.0-1.10.0.inc.php'; + //include 'update-files-1.9.0-1.10.0.inc.php'; + //Only updates the configuration.inc.php with the new version + include 'update-configuration.inc.php'; + break; default: break; } diff --git a/main/install/version.php b/main/install/version.php index 6f012937a5..9ccd6283fd 100755 --- a/main/install/version.php +++ b/main/install/version.php @@ -12,10 +12,10 @@ /** * Variables used from the main/install/index.php */ -$new_version = '1.9.10'; -$new_version_status = 'beta'; +$new_version = '1.10.0'; +$new_version_status = 'alpha'; $new_version_last_id = 0; $new_version_stable = false; -$new_version_major = false; +$new_version_major = true; $software_name = 'Chamilo'; $software_url = 'http://www.chamilo.org/';