diff -abdurN --exclude='CVS*' --ignore-matching-lines='^.*\$Id: .*\$.*$' --ignore-matching-lines='^.*\$Revision: .*\$.*$' --ignore-matching-lines='^.*\$Source: .*\$.*$' accwhizz/setup/lang.php /var/www/html/dev/accwhizz/setup/lang.php --- accwhizz/setup/lang.php Thu Sep 12 19:26:05 2002 +++ /var/www/html/dev/accwhizz/setup/lang.php Mon Sep 23 22:06:05 2002 @@ -49,6 +49,7 @@ $GLOBALS['phpgw_setup']->db->transaction_begin(); if (count($lang_selected)) { + $GLOBALS['phpgw_setup']->db->Halt_On_Error='yes'; if ($upgrademethod == 'dumpold') { $GLOBALS['phpgw_setup']->db->query("DELETE FROM lang",__LINE__,__FILE__); @@ -87,6 +88,7 @@ $raw[] = file($appfile); } } + $GLOBALS['phpgw_setup']->db->Halt_On_Error='yes'; @reset($raw); while (list($a,$raw_file) = @each($raw)) { @@ -102,7 +104,10 @@ if ($upgrademethod == 'addmissing') { //echo '<br>Test: addmissing'; - $GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM lang WHERE message_id='".$message_id."' and lang='".$GLOBALS['phpgw_setup']->db_lang."'",__LINE__,__FILE__); + $GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM lang ". + "xWHERE message_id='".$message_id."' ". + "and lang='".$GLOBALS['phpgw_setup']->db_lang."' ". + "and app_name='$app_name'",__LINE__,__FILE__); $GLOBALS['phpgw_setup']->db->next_record(); if ($GLOBALS['phpgw_setup']->db->f(0) == 0) @@ -116,7 +121,7 @@ { if($message_id && $content) { - // echo "<br>adding - insert into lang values ('$message_id','$app_name','$GLOBALS['phpgw_setup']->db_lang','$content')"; + //echo "<br>adding - insert into lang values ('$message_id','$app_name','".$GLOBALS['phpgw_setup']->db_lang."','$content')"; $GLOBALS['phpgw_setup']->db->query("INSERT into lang VALUES ('$message_id','$app_name','".$GLOBALS['phpgw_setup']->db_lang."','$content')",__LINE__,__FILE__); } }