diff --git a/inc/define.php b/inc/define.php index 5b544aa3bf..050cbbe72d 100755 --- a/inc/define.php +++ b/inc/define.php @@ -33,7 +33,7 @@ // Last version of GLPI only for plugin compatibility define('GLPI_VERSION', '9.5.13'); -define('ITSM_VERSION', '2.0.0_beta3'); +define('ITSM_VERSION', '2.0.0_rc1'); if (substr(ITSM_VERSION, -4) === '-dev') { //for dev version define('ITSM_PREVER', str_replace('-dev', '', ITSM_VERSION)); @@ -43,7 +43,7 @@ ); } else { //for stable version - define("ITSM_SCHEMA_VERSION", '2.0.0_beta3'); + define("ITSM_SCHEMA_VERSION", '2.0.0_rc1'); } // Current version of ITSM-NG diff --git a/inc/update.class.php b/inc/update.class.php index 1482b4f71b..3761bc52e3 100644 --- a/inc/update.class.php +++ b/inc/update.class.php @@ -539,7 +539,7 @@ public function doUpdates($current_version = null) { case "1.6.0": include_once "{$updir}itsm_update_150_151.php"; update150to151(); - case "2.0.0_beta3": + case "2.0.0_rc1": include_once "{$updir}itsm_update_151_200.php"; update151to200(); diff --git a/install/itsm_update_151_200.php b/install/itsm_update_151_200.php index fd858b9591..18041ac26d 100644 --- a/install/itsm_update_151_200.php +++ b/install/itsm_update_151_200.php @@ -42,8 +42,8 @@ function update151to200() : bool { $current_config = Config::getConfigurationValues('core'); $updateresult = true; - $migration->displayTitle(sprintf(__('Update to %s'), '2.0.0_beta3')); - $migration->setVersion('2.0.0_beta3'); + $migration->displayTitle(sprintf(__('Update to %s'), '2.0.0_rc1')); + $migration->setVersion('2.0.0_rc1'); if(!$DB->fieldExists('glpi_users', 'menu_favorite')) { $query = "alter table glpi_users add column menu_favorite longtext default '{}';"; diff --git a/templates/macros/wrappedInput.twig b/templates/macros/wrappedInput.twig index c3e2e82a50..e5b3f8c9da 100644 --- a/templates/macros/wrappedInput.twig +++ b/templates/macros/wrappedInput.twig @@ -51,4 +51,4 @@ {% endif %} {% endmacro %} -{{_self.wrappedInput(title, input)}} \ No newline at end of file +{{_self.wrappedInput(title, input, root_doc)}} \ No newline at end of file