Modified: trunk/phpgwapi/inc/functions.inc.php
URL: http://www.egroupware.org/viewvc/trunk/phpgwapi/inc/functions.inc.php?= rev=3D24909&r1=3D24908&r2=3D24909&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/phpgwapi/inc/functions.inc.php (original)
+++ trunk/phpgwapi/inc/functions.inc.php Fri Jan 25 11:54:51 2008
@@ -80,13 +80,14 @@
// including the necessary class-definitions
foreach($_SESSION['egw_included_files'] as $file)
{
+ if (basename($file) =3D=3D 'class.config.inc.php') continue;
//echo "<p>about to include $file</p>\n";
include_once($file);
-
- if (basename($file) =3D=3D 'class.egw_framework.inc.php') break; // th=
e rest is not needed and makes only problems
+ //if (basename($file) =3D=3D 'class.egw_framework.inc.php') break; // =
the rest is not needed and makes only problems
}
$GLOBALS['egw'] =3D unserialize($_SESSION['egw_object_cache']);
- =
+ include_once(EGW_API_INC.'/class.config.inc.php');
+
if (is_object($GLOBALS['egw']))
{
$GLOBALS['egw']->wakeup2(); // adapt the restored egw-object/enviromen=
t to this request (eg. changed current app)
@@ -199,7 +200,7 @@
{
switch(basename($file))
{
- case 'head.inc.php': // needs EGW_TEMPLATE_DIR and is included anyway b=
y common::egw_header()
+ case 'header.inc.php': // needs EGW_TEMPLATE_DIR and is included anyway=
by common::egw_header()
case 'functions.inc.php': // not needed/wanted at all
break;
default:
