mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-26 21:01:30 +02:00
Fix for upgrading lang files.
This commit is contained in:
parent
94e13fe529
commit
6df27ba200
@ -99,7 +99,7 @@
|
|||||||
$app_name = $GLOBALS['phpgw_setup']->db->db_addslashes(chop($app_name));
|
$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));
|
$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));
|
$content = $GLOBALS['phpgw_setup']->db->db_addslashes(chop($content));
|
||||||
if ($upgrademethod == 'addmissing')
|
if ($upgrademethod == 'addmissing' && $upgrademethod == 'dumpold')
|
||||||
{
|
{
|
||||||
//echo '<br>Test: addmissing';
|
//echo '<br>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__);
|
$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)
|
if($message_id && $content)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user