From 9a7043abc6472869f472ffd6791f7ae985cc6645 Mon Sep 17 00:00:00 2001
From: zone <zone@alumni.egroupware.org>
Date: Fri, 10 Aug 2001 06:52:19 +0000
Subject: [PATCH] Corrected problem with config_app always getting set to
 'phpgwapi'

---
 admin/config.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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