From cb4edd44e3cebfda7f6820304c3bb02515e5a8bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@laposte.net>
Date: Thu, 5 Sep 2013 10:06:51 +0200
Subject: [PATCH] Fixes: #2697 moving smarty var from variables_common.inc to
variables.inc
---
contrib/bin/fusiondirectory-setup | 4 ++++
include/variables.inc | 5 +++++
include/variables_common.inc | 5 -----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index cf3be6915..9888ddd64 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -34,6 +34,7 @@ my %vars = (
fd_home => "/var/www/fusiondirectory",
fd_cache => "/var/cache/fusiondirectory",
fd_config_dir => "/etc/fusiondirectory",
+ fd_smarty_dir => "/usr/share/php/smarty3/Smarty.class.php",
fd_spool_dir => "/var/spool/fusiondirectory",
config_file => "fusiondirectory.conf",
secrets_file => "fusiondirectory.secrets",
@@ -456,6 +457,9 @@ if (!defined("CONFIG_FILE")) {
define ("CONFIG_FILE", "$vars{config_file}"); /* FusionDirectory filename */
}
+/* Path for smarty3 libraries */
+define("SMARTY", "$vars{fd_smarty_dir}");
+
/* Smarty compile dir */
define ("SPOOL_DIR", "$vars{fd_spool_dir}/"); /* FusionDirectory spool directory */
diff --git a/include/variables.inc b/include/variables.inc
index 48e32384f..52c91ef4d 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -39,6 +39,11 @@ if (!defined("CONFIG_FILE")) {
define ("CONFIG_FILE", "fusiondirectory.conf"); /* FusionDirectory filename */
}
+/*!
+ * \brief Path for smarty3 libraries
+ */
+define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php");
+
/*!
* \brief Smarty compile dir
*/
diff --git a/include/variables_common.inc b/include/variables_common.inc
index b99bfef6a..dbc7a6728 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -60,11 +60,6 @@ define("FPDF", "/usr/share/php/fpdf/fpdf.php"); /*! Define fpdf library path */
*/
define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path */
-/*!
- * \brief Path for smarty3 libraries
- */
-define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php"); /*! Define smarty3 library path */
-
/*!
* \brief FusionDirectory Version
*/
--
GitLab