From 87f812451a600287671dfea64d34c77190908a64 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 19 Oct 2002 11:15:23 +0000 Subject: [PATCH] - changed the way so_sql is loaded - modified writeLangFile to include the types and return the message --- .../doc/et_media/inc/class.et_media.inc.php | 9 +++----- etemplate/doc/etemplate.html | 21 +++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etemplate/doc/et_media/inc/class.et_media.inc.php b/etemplate/doc/et_media/inc/class.et_media.inc.php index a7b10921b4..c8f7ce361d 100644 --- a/etemplate/doc/et_media/inc/class.et_media.inc.php +++ b/etemplate/doc/et_media/inc/class.et_media.inc.php @@ -12,11 +12,8 @@ /* $Id$ */ - if(!isset($GLOBALS['phpgw_info']['flags']['included_classes']['so_sql'])) - { - include(PHPGW_API_INC . '/../../etemplate/inc/class.so_sql.inc.php'); - $GLOBALS['phpgw_info']['flags']['included_classes']['so_sql'] = True; - } + include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.so_sql.inc.php'); + $GLOBALS['phpgw_info']['flags']['included_classes']['so_sql'] = True; // for 0.9.14 class et_media extends so_sql { @@ -154,7 +151,7 @@ { $etm = new et_media(False); // no lang on messages - $this->tmpl->writeLangFile('et_media','en',$etm->messages); + return $this->tmpl->writeLangFile('et_media','en',$etm->messages+$etm->types); } }; diff --git a/etemplate/doc/etemplate.html b/etemplate/doc/etemplate.html index c891457942..b498636127 100644 --- a/etemplate/doc/etemplate.html +++ b/etemplate/doc/etemplate.html @@ -1,8 +1,8 @@ + phpGroupware: eTemplates - Templates and Dialog-Editor -