Fixed template location

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11468 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/debian/patches/02_fix_template_location.dpatch b/gosa-core/debian/patches/02_fix_template_location.dpatch
index 522adcbe0a4270fbad7794ca5d1641890d551471..ba048bc8b4839c6c102649b35d554d4f46f6df7d 100755 (executable)
--- a/gosa-core/debian/patches/02_fix_template_location.dpatch
+++ b/gosa-core/debian/patches/02_fix_template_location.dpatch
@@ -12,8 +12,8 @@ diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc
    define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
  }
  
--define ("CONFIG_TEMPLATE_DIR", "../contrib/");
-+define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/");
+-define ("CONFIG_TEMPLATE_DIR", "../contrib");
++define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa");
  define ("TEMP_DIR","/var/cache/gosa/tmp");
  
  /* Define get_list flags */

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 52fe8b7914f02de031a4aebdbe0af7e5666adcb1..1bc2cf019f5759c648448f5117767dd4ea4b2ed7 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -40,7 +40,7 @@ if(!isset($_SERVER['CONFIG_FILE'])){
   define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
 }
 
-define ("CONFIG_TEMPLATE_DIR", "../contrib/");
+define ("CONFIG_TEMPLATE_DIR", "../contrib");
 define ("TEMP_DIR","/var/cache/gosa/tmp");
 
 /* Define get_list flags */