From 10f3a939478871b850c21596fcf83694e2cb5e73 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 28 Jan 2008 13:18:35 +0000 Subject: [PATCH] fixing a possible problem in the fix. accidently commented out the line that stops including files after framework inclusion. It does cause problems! --- phpgwapi/inc/functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index d547d0c949..2f37753f52 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -83,7 +83,7 @@ if ($GLOBALS['egw_info']['server']['sessions_type'] == 'php4-restore' && $_REQUE if (basename($file) == 'class.config.inc.php') continue; //echo "

about to include $file

\n"; include_once($file); - //if (basename($file) == 'class.egw_framework.inc.php') break; // the rest is not needed and makes only problems + if (basename($file) == 'class.egw_framework.inc.php') break; // the rest is not needed and makes only problems } $GLOBALS['egw'] = unserialize($_SESSION['egw_object_cache']); include_once(EGW_API_INC.'/class.config.inc.php');