From 850a835f1c858fcd3964fb79d3c0935827648478 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 29 Sep 2002 08:50:18 +0000 Subject: [PATCH] using include_once now to include the class we extend and exclusivly the etemplate.html class --- etemplate/inc/class.boetemplate.inc.php | 2 +- etemplate/inc/class.etemplate.inc.php | 2 +- etemplate/inc/class.uietemplate.inc.php | 2 +- etemplate/inc/class.uietemplate_gtk.inc.php | 2 +- infolog/setup/setup.inc.php | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php index 9574047664..732e1ffbb9 100644 --- a/etemplate/inc/class.boetemplate.inc.php +++ b/etemplate/inc/class.boetemplate.inc.php @@ -12,7 +12,7 @@ /* $Id$ */ - include(PHPGW_API_INC . '/../../etemplate/inc/class.soetemplate.inc.php'); + include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.soetemplate.inc.php'); /*! @class boetemplate diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index 7249f49f32..262b1eace9 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -17,4 +17,4 @@ { $ui = '_gtk'; } - include(PHPGW_API_INC . "/../../etemplate/inc/class.uietemplate$ui.inc.php"); + include_once(PHPGW_INCLUDE_ROOT . "/etemplate/inc/class.uietemplate$ui.inc.php"); diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php index b6af7331af..9948e3cd96 100644 --- a/etemplate/inc/class.uietemplate.inc.php +++ b/etemplate/inc/class.uietemplate.inc.php @@ -12,7 +12,7 @@ /* $Id$ */ - include(PHPGW_API_INC . '/../../etemplate/inc/class.boetemplate.inc.php'); + include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.boetemplate.inc.php'); /*! @class etemplate diff --git a/etemplate/inc/class.uietemplate_gtk.inc.php b/etemplate/inc/class.uietemplate_gtk.inc.php index bd1cf84d61..a25d691441 100644 --- a/etemplate/inc/class.uietemplate_gtk.inc.php +++ b/etemplate/inc/class.uietemplate_gtk.inc.php @@ -12,7 +12,7 @@ /* $Id$ */ - include(PHPGW_API_INC . '/../../etemplate/inc/class.boetemplate.inc.php'); + include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.boetemplate.inc.php'); /*! @class etemplate diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php index 4b4f9b3b30..0ab56acd71 100755 --- a/infolog/setup/setup.inc.php +++ b/infolog/setup/setup.inc.php @@ -39,4 +39,8 @@ 'appname' => 'phpgwapi', 'versions' => Array('0.9.13', '0.9.14','0.9.15') ); + $setup_info['infolog']['depends'][] = array( + 'appname' => 'etemplate', + 'versions' => Array('0.9.13', '0.9.14','0.9.15') + ); ?>