From 3ff202956dbb63dbcaf41f7f7e57a35dab6255ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Wed, 6 May 2015 15:11:24 +0200
Subject: [PATCH] Fixes #3750 fusiondirectory.conf attribute configVersion is
unused and should be removed
---
contrib/fusiondirectory.conf | 2 +-
contrib/man/fusiondirectory.conf.5 | 2 +-
contrib/man/fusiondirectory.conf.pod | 2 +-
include/class_config.inc | 4 ----
setup/class_setup.inc | 1 -
setup/class_setupStep_Finish.inc | 1 -
6 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index 5cef0d8b7..6ae25eeca 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -1,5 +1,5 @@
{literal}<?xml version="1.0"?>{/literal}
-<conf configVersion="{$config_checksum}" >
+<conf>
<!-- Services **************************************************************
Old services that are not based on simpleService needs to be listed here
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index e662aef7f..859ef6cf8 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -145,7 +145,7 @@ Layout example:
<?xml version=\*(L"1.0\*(R"?>
.PP
.Vb 1
-\& <conf configVersion="...." >
+\& <conf>
\&
\& <!\-\- Global setup \-\->
\& <main>
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 428192380..0c80a57bb 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -16,7 +16,7 @@ Layout example:
<?xml version="1.0"?>
- <conf configVersion="...." >
+ <conf>
<!-- Global setup -->
<main>
diff --git a/include/class_config.inc b/include/class_config.inc
index 9f6176e86..bfca96eb2 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -63,7 +63,6 @@ class config {
'MENU' => array()
);
var $basedir = "";
- var $config_version = "NOT SET";
/* Keep a copy of the current department list */
var $departments = array();
@@ -185,9 +184,6 @@ class config {
/* Trigger on CONF section */
if ($tag == 'CONF') {
$this->config_found = TRUE;
- if (isset($attrs['CONFIGVERSION'])) {
- $this->config_version = $attrs['CONFIGVERSION'];
- }
}
/* Return if we're not in config section */
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 5c69b2328..6a4e00432 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -305,7 +305,6 @@ class setup
$cv['fdForceSSL'] = TRUE;
$cv['debugLevel'] = 0;
$smarty->assign("cv", xmlentities($cv));
- $smarty->assign("config_checksum", md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
$smarty->assign("templateCompileDirectory", SPOOL_DIR);
$xml = $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
$config->parse_data($xml);
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 2e0dd94a7..3c3b02527 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -48,7 +48,6 @@ class Step_Finish extends setupStep
$cv = $this->parent->captured_values;
$cv['debugLevel'] = $this->parent->getDebugLevel();
$smarty->assign('cv', xmlentities($cv));
- $smarty->assign('config_checksum', md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
$smarty->assign('templateCompileDirectory', SPOOL_DIR);
return $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
}
--
GitLab