projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added inline company switching with set_global_connection()
[fa-stable.git]
/
admin
/
inst_upgrade.php
diff --git
a/admin/inst_upgrade.php
b/admin/inst_upgrade.php
index eeee26a214b88152e2a01d84e9d607643f40eeb7..bd9e1b4ba4f6a610b639e52944ed548177a06e91 100644
(file)
--- a/
admin/inst_upgrade.php
+++ b/
admin/inst_upgrade.php
@@
-121,26
+121,16
@@
function upgrade_step($index, $conn)
return $ret;
}
return $ret;
}
-function db_open($conn)
-{
- $db = mysql_connect($conn["host"] ,$conn["dbuser"], $conn["dbpassword"]);
- if (!$db)
- return false;
- if (!mysql_select_db($conn["dbname"], $db))
- return false;
- return $db;
-}
-
$installers = get_installers();
if (get_post('Upgrade'))
{
$ret = true;
$installers = get_installers();
if (get_post('Upgrade'))
{
$ret = true;
- foreach ($db_connections as $conn)
+ foreach ($db_connections as $co
mp => $co
nn)
{
// connect to database
{
// connect to database
- if (!(
$db = db_open($conn
)))
+ if (!(
set_global_connection($comp
)))
{
display_error(_("Cannot connect to database for company")
." '".$conn['name']."'");
{
display_error(_("Cannot connect to database for company")
." '".$conn['name']."'");
@@
-162,6
+152,7
@@
if (get_post('Upgrade'))
// db_close($conn); ?
if (!$ret) break;
}
// db_close($conn); ?
if (!$ret) break;
}
+ set_global_connection();
if($ret)
{ // re-read the prefs
global $path_to_root;
if($ret)
{ // re-read the prefs
global $path_to_root;