[Phpgroupware-cvs] CVS: setup lang.php,1.42,1.43

[Mark A Peters <address@hidden>]

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

Modified Files:
        lang.php 
Log Message:
Fix for upgrading lang files.

Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** lang.php    18 Oct 2002 14:44:10 -0000      1.42
--- lang.php    16 Nov 2002 12:27:04 -0000      1.43
***************
*** 100,104 ****
                                                        
$GLOBALS['phpgw_setup']->db_lang    = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($GLOBALS['phpgw_setup']->db_lang));
                                                        $content    = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($content));
!                                                       if ($upgrademethod == 
'addmissing')
                                                        {
                                                                //echo 
'<br>Test: addmissing';
--- 100,104 ----
                                                        
$GLOBALS['phpgw_setup']->db_lang    = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($GLOBALS['phpgw_setup']->db_lang));
                                                        $content    = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($content));
!                                                       if ($upgrademethod == 
'addmissing' && $upgrademethod == 'dumpold')
                                                        {
                                                                //echo 
'<br>Test: addmissing';
***************
*** 113,117 ****
                                                        }
  
!                                                       if ($addit || 
($upgrademethod == 'dumpold' || $newinstall || $upgrademethod == 'addonlynew'))
                                                        {
                                                                if($message_id 
&& $content)
--- 113,118 ----
                                                        }
  
! //                                                    if ($addit || 
($upgrademethod == 'dumpold' || $newinstall || $upgrademethod == 'addonlynew'))
!                                                       if ($addit || 
($newinstall || $upgrademethod == 'addonlynew'))
                                                        {
                                                                if($message_id 
&& $content)