phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] [18991] Fix a read_repository thing, and re enable th


From: Caeies
Subject: [Phpgroupware-cvs] [18991] Fix a read_repository thing, and re enable the config read at startup, since we need the config infos for redirect_links ...
Date: Wed, 19 Nov 2008 17:53:04 +0000

Revision: 18991
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18991
Author:   Caeies
Date:     2008-11-19 17:53:03 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
Fix a read_repository thing, and re enable the config read at startup, since we 
need the config infos for redirect_links ... if you remove this code, please 
provide a real fix \!\!\!

Modified Paths:
--------------
    core/trunk/phpgwapi/inc/functions.inc.php

Modified: core/trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/functions.inc.php   2008-11-19 17:51:00 UTC (rev 
18990)
+++ core/trunk/phpgwapi/inc/functions.inc.php   2008-11-19 17:53:03 UTC (rev 
18991)
@@ -393,7 +393,7 @@
        else
        {
                $c = createObject('phpgwapi.config','phpgwapi');
-               $c->read_repository();
+               $c->read();
                foreach ($c->config_data as $k => $v)
                {
                        $GLOBALS['phpgw_info']['server'][$k] = $v;
@@ -411,6 +411,14 @@
        unset($cache_query);
        unset($server_info_cache);
        */
+       //XXX Caeies, unfortunately, this is not dead code, but needed one :( - 
nov08
+       //XXX Sample problem : use phpgroupware on a non root apache, 
webserver_url is not set, so the redirect_link is failling ...
+       $c = createObject('phpgwapi.config','phpgwapi');
+       $c->read();
+       foreach ($c->config_data as $k => $v)
+       {
+               $GLOBALS['phpgw_info']['server'][$k] = $v;
+       }
 
        // In the case we use a fall back (mode Half remote_user)
        if(isset($GLOBALS['phpgw_remote_user']) && 
!empty($GLOBALS['phpgw_remote_user']))






reply via email to

[Prev in Thread] Current Thread [Next in Thread]