merged differences from the .14 branch

This commit is contained in:
Ralf Becker 2002-11-23 12:32:16 +00:00
parent 2f4fe2ca2a
commit 5b8fb9df75

View File

@ -51,7 +51,8 @@
{ {
if ($upgrademethod == 'dumpold') if ($upgrademethod == 'dumpold')
{ {
$GLOBALS['phpgw_setup']->db->query("DELETE FROM phpgw_lang",__LINE__,__FILE__); // 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'; //echo '<br>Test: dumpold';
} }
while (list($null,$lang) = each($lang_selected)) while (list($null,$lang) = each($lang_selected))