From c5d0f2dfcf6460756b9a3bdfd185170f3ee1cdd3 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 9 Feb 2009 16:30:04 +0000 Subject: [PATCH] Updated patch to make ubuntu + debian work well git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13410 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../debian/patches/01_fix_smarty_location.dpatch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gosa-core/debian/patches/01_fix_smarty_location.dpatch b/gosa-core/debian/patches/01_fix_smarty_location.dpatch index f7044eccb..1e543c2e7 100755 --- a/gosa-core/debian/patches/01_fix_smarty_location.dpatch +++ b/gosa-core/debian/patches/01_fix_smarty_location.dpatch @@ -6,14 +6,18 @@ @DPATCH@ diff -urNad gosa-core~/include/php_setup.inc gosa-core/include/php_setup.inc ---- gosa-core~/include/php_setup.inc 2008-03-17 23:52:36.000000000 +0100 -+++ gosa-core/include/php_setup.inc 2008-04-07 23:12:32.000000000 +0200 -@@ -274,7 +274,7 @@ +--- gosa-core~/include/php_setup.inc 2008-12-12 13:31:08.000000000 +0100 ++++ gosa-core/include/php_setup.inc 2009-02-09 17:25:51.000000000 +0100 +@@ -277,7 +277,11 @@ ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel"); /* Do smarty setup */ -require("smarty/Smarty.class.php"); -+require("/usr/share/php/smarty/libs/Smarty.class.php"); ++if (file_exists("/usr/share/php/smarty/Smarty.class.php")){ ++ require("/usr/share/php/smarty/Smarty.class.php"); ++} else { ++ require("/usr/share/php/smarty/libs/Smarty.class.php"); ++} $smarty = new Smarty; $smarty->template_dir = $BASE_DIR.'/ihtml/'; $smarty->caching= false; -- 2.30.2