projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction in accruals to avoid skipping shorter months.
[fa-stable.git]
/
admin
/
inst_upgrade.php
diff --git
a/admin/inst_upgrade.php
b/admin/inst_upgrade.php
index 9691b22e0eedeb4aa15bf0f1bf2958d09031b11f..4e7e05b43309b0f6fb1c5ebd69d641712e843646 100644
(file)
--- a/
admin/inst_upgrade.php
+++ b/
admin/inst_upgrade.php
@@
-52,7
+52,7
@@
function get_installers()
//
// Apply one differential data set.
//
//
// Apply one differential data set.
//
-function upgrade_step($index, $conn)
+function upgrade_step($index, $co
mpany, $co
nn)
{
global $path_to_root, $installers;
{
global $path_to_root, $installers;
@@
-75,7
+75,7
@@
function upgrade_step($index, $conn)
if ($sql != '')
$ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
if ($sql != '')
$ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
- $ret &= $inst->install($
pref
, $force);
+ $ret &= $inst->install($
company
, $force);
error_log(_("Database upgrade finished."));
error_log(_("Database upgrade finished."));
@@
-104,11
+104,11
@@
if (get_post('Upgrade'))
continue;
}
// create security backup
continue;
}
// create security backup
- db_backup($conn, 'no', 'Security backup before upgrade'
, $conn['tbpref']
);
+ db_backup($conn, 'no', 'Security backup before upgrade');
// apply all upgrade data
foreach ($installers as $i => $inst)
{
// apply all upgrade data
foreach ($installers as $i => $inst)
{
- $ret = upgrade_step($i, $conn);
+ $ret = upgrade_step($i, $co
mp, $co
nn);
if (!$ret)
display_error(
sprintf(_("Database upgrade to version %s failed for company '%s'."),
if (!$ret)
display_error(
sprintf(_("Database upgrade to version %s failed for company '%s'."),