Corrected problem with config_app always getting set to 'phpgwapi'

This commit is contained in:
zone 2001-08-10 06:52:19 +00:00
parent 5367dfd839
commit 9a7043abc6

View File

@ -20,9 +20,11 @@
); );
include('../header.inc.php'); include('../header.inc.php');
if ($appname == 'admin') $config_appname = $appname;
if ($appname == 'admin' || $appname == 'preferences')
{ {
$appname = 'preferences'; $appname = 'preferences';
$config_appname = 'phpgwapi';
} }
$t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir($appname)); $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir($appname));
$t->set_unknowns('keep'); $t->set_unknowns('keep');
@ -33,19 +35,13 @@
$t->set_block('config','body','body'); $t->set_block('config','body','body');
$t->set_block('config','footer','footer'); $t->set_block('config','footer','footer');
$c = CreateObject('phpgwapi.config',$appname); $c = CreateObject('phpgwapi.config',$config_appname);
$c->read_repository(); $c->read_repository();
if ($c->config_data) if ($c->config_data)
{ {
$current_config = $c->config_data; $current_config = $c->config_data;
} }
else
{
$c->appname = 'phpgwapi';
$c->read_repository();
$current_config = $c->config_data;
}
if ($cancel) if ($cancel)
{ {