From 978f8e282db6621871a99c0c90772933034d7912 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 2 Apr 2016 20:25:01 +0000 Subject: [PATCH] show api version instead of phpgwapi --- setup/inc/class.setup_html.inc.php | 10 +++++++++- setup/templates/default/footer.tpl | 16 +--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php index 2838eab7a2..f546e74d32 100644 --- a/setup/inc/class.setup_html.inc.php +++ b/setup/inc/class.setup_html.inc.php @@ -156,7 +156,15 @@ class setup_html } $GLOBALS['setup_tpl']->set_var('lang_version',lang('version')); - $GLOBALS['setup_tpl']->set_var('pgw_ver',@$GLOBALS['egw_info']['server']['versions']['phpgwapi']); + if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api'])) + { + include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'); + } + else + { + $setup_info = $GLOBALS['setup_info']; + } + $GLOBALS['setup_tpl']->set_var('pgw_ver', $setup_info['api']['version']); $GLOBALS['setup_tpl']->set_var(array( 'logoutbutton' => $btn_logout, 'indexbutton' => $index_btn, diff --git a/setup/templates/default/footer.tpl b/setup/templates/default/footer.tpl index 1e5f773042..8f92b94416 100644 --- a/setup/templates/default/footer.tpl +++ b/setup/templates/default/footer.tpl @@ -7,21 +7,7 @@ -

 eGroupWare {lang_version} {pgw_ver}
+

 EGroupware {lang_version} {pgw_ver}
-