diff --git a/setup/lang.php b/setup/lang.php index f627f1d746..70956aee67 100644 --- a/setup/lang.php +++ b/setup/lang.php @@ -99,7 +99,7 @@ $app_name = $GLOBALS['phpgw_setup']->db->db_addslashes(chop($app_name)); $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') + if ($upgrademethod == 'addmissing' && $upgrademethod == 'dumpold') { //echo '
Test: addmissing'; $GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM phpgw_lang WHERE message_id='".$message_id."' and lang='".$GLOBALS['phpgw_setup']->db_lang."' and (app_name='".$app_name."' or app_name='common')",__LINE__,__FILE__); @@ -112,7 +112,8 @@ } } - if ($addit || ($upgrademethod == 'dumpold' || $newinstall || $upgrademethod == 'addonlynew')) +// if ($addit || ($upgrademethod == 'dumpold' || $newinstall || $upgrademethod == 'addonlynew')) + if ($addit || ($newinstall || $upgrademethod == 'addonlynew')) { if($message_id && $content) {