From d6d81b59a311427b85f2f571df9af5ddde1f0be7 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_setupStep_Finish.inc | 8 +++++---
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index f976f074c..f60259ca1 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 ccd809124..14462fdff 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();
@@ -182,9 +181,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_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index ab50e654e..adc073649 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -41,9 +41,11 @@ class Step_Finish extends setup_step
function get_conf_data()
{
- $smarty = get_smarty();
- $smarty->assign("cv", xmlentities($this->parent->captured_values));
- $smarty->assign("config_checksum", md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
+ $smarty = get_smarty();
+ $cv = $this->parent->captured_values;
+ $cv['debugLevel'] = $this->parent->getDebugLevel();
+ $smarty->assign('cv', xmlentities($cv));
+ $smarty->assign('templateCompileDirectory', SPOOL_DIR);
return $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
}
--
GitLab