[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.blocks_bo.inc.php,1.1.2.1,1.1.2.2 class.ui.inc.php,1.7.2.4,1.7.2.5

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc
In directory subversions:/tmp/cvs-serv3575/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.blocks_bo.inc.php class.ui.inc.php 
Log Message:
change inclusion of blockconfig since it calls lang before the user's language 
is set


Index: class.blocks_bo.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/Attic/class.blocks_bo.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.blocks_bo.inc.php     22 Nov 2002 06:05:28 -0000      1.1.2.1
--- class.blocks_bo.inc.php     2 Dec 2002 20:39:55 -0000       1.1.2.2
***************
*** 19,22 ****
--- 19,23 ----
                {
                        global $blocks;
+                       
require_once($GLOBALS['sitemgr_info']['sitemgr-site_path'] . 
'/blockconfig.inc.php');
                        $this->b = $blocks;
                        $this->bo = new bo;

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.ui.inc.php,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -C2 -r1.7.2.4 -r1.7.2.5
*** class.ui.inc.php    22 Nov 2002 06:05:28 -0000      1.7.2.4
--- class.ui.inc.php    2 Dec 2002 20:39:55 -0000       1.7.2.5
***************
*** 21,24 ****
--- 21,26 ----
                        $this->bo = new bo;
                        $this->t = new Template2;
+ 
+                       $this->bo->setsitemgrPreferredLanguage();
                        
                        
require_once($GLOBALS['sitemgr_info']['sitemgr-site_path'] .
***************
*** 26,30 ****
                        $this->blocks_bo = new blocks_bo;
                        
!                       $this->bo->setsitemgrPreferredLanguage();
                }
  
--- 28,32 ----
                        $this->blocks_bo = new blocks_bo;
                        
!                       
                }