[Phpgroupware-cvs] CVS: setup lang.php,1.44,1.45

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv5226

Modified Files:
        lang.php 
Log Message:
merged differences from the .14 branch


Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** lang.php    21 Nov 2002 02:07:02 -0000      1.44
--- lang.php    23 Nov 2002 12:32:16 -0000      1.45
***************
*** 52,56 ****
                        if ($upgrademethod == 'dumpold')
                        {
!                               $GLOBALS['phpgw_setup']->db->query("DELETE FROM 
phpgw_lang",__LINE__,__FILE__);
                                //echo '<br>Test: dumpold';
                        }
--- 52,57 ----
                        if ($upgrademethod == 'dumpold')
                        {
!                               // dont delete the custom main- & loginscreen 
messages every time
!                               $GLOBALS['phpgw_setup']->db->query("DELETE FROM 
phpgw_lang where app_name != 'mainscreen' AND app_name != 
'loginscreen'",__LINE__,__FILE__);
                                //echo '<br>Test: dumpold';
                        }