Had to add one more variable back to make the new header template work

This commit is contained in:
Miles Lott 2001-05-30 08:56:01 +00:00
parent c4972fd5b3
commit d4cb332f25
3 changed files with 12 additions and 10 deletions

View File

@ -81,9 +81,10 @@
\**************************************************************************/ \**************************************************************************/
define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc'); define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php'); include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
$phpgw_info["server"]["versions"]["phpgwapi"] = $setup_info['phpgwapi']['version'];
$phpgw_info['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header']; $phpgw_info['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
unset($setup_info); unset($setup_info);
$phpgw_info['server']['versions']['header'] = '1.13'; $phpgw_info['server']['versions']['header'] = '1.14';
// This is a fix for NT // This is a fix for NT
if (!isset($phpgw_info['flags']['noapi']) || !$phpgw_info['flags']['noapi'] == True) if (!isset($phpgw_info['flags']['noapi']) || !$phpgw_info['flags']['noapi'] == True)
{ {

View File

@ -3,7 +3,7 @@
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi'; $setup_info['phpgwapi']['title'] = 'phpgwapi';
$setup_info['phpgwapi']['version'] = '0.9.13.001'; $setup_info['phpgwapi']['version'] = '0.9.13.001';
$setup_info['phpgwapi']['versions']['current_header'] = '1.13'; $setup_info['phpgwapi']['versions']['current_header'] = '1.14';
// $setup_info['phpgwapi']['app_order'] = '6'; // $setup_info['phpgwapi']['app_order'] = '6';
/* The tables this app creates */ /* The tables this app creates */

View File

@ -87,15 +87,16 @@
// password in ../header.inc.php to protect all of the setup // password in ../header.inc.php to protect all of the setup
// pages from unauthorized use. // pages from unauthorized use.
if(file_exists('../version.inc.php')) {
include('../version.inc.php'); // To set the current core version
}else{
$phpgw_info['server']['versions']['phpgwapi'] = 'Undetected';
}
$phpgw_info['server']['app_images'] = 'templates/default/images'; $phpgw_info['server']['app_images'] = 'templates/default/images';
if(file_exists('../header.inc.php')) { include('../header.inc.php'); } if(file_exists('../header.inc.php'))
{
include('../header.inc.php');
}
else
{
$phpgw_info['server']['versions']['phpgwapi'] = 'Undetected';
}
include('./inc/phpgw_setup.inc.php'); include('./inc/phpgw_setup.inc.php');
include('./inc/phpgw_schema_proc.inc.php'); include('./inc/phpgw_schema_proc.inc.php');