From 1f6bef28b8801d8f902ab23c520dfcf7430b1394 Mon Sep 17 00:00:00 2001 From: artem Date: Wed, 7 May 2008 10:40:10 +0000 Subject: - [DEV-137] minor fix to setup (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5681 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/setup.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'frontends/php/include/setup.inc.php') diff --git a/frontends/php/include/setup.inc.php b/frontends/php/include/setup.inc.php index 08aa5ca3..cc9b3573 100644 --- a/frontends/php/include/setup.inc.php +++ b/frontends/php/include/setup.inc.php @@ -533,7 +533,7 @@ { global $DB; - $old_DB = $DB['DB']; +// $old_DB = $DB['DB']; $old_DB_TYPE = $DB['TYPE']; $old_DB_SERVER = $DB['SERVER']; $old_DB_PORT = $DB['PORT']; @@ -572,7 +572,7 @@ /* restore connection */ global $DB; - $DB['DB'] = $old_DB; +// $DB['DB'] = $old_DB; $DB['TYPE'] = $old_DB_TYPE; $DB['SERVER'] = $old_DB_SERVER; $DB['PORT'] = $old_DB_PORT; @@ -673,9 +673,9 @@ function CheckConfigurationFile() { - global $DB; + global $DB,$ZBX_SERVER,$ZBX_SERVER_PORT; - $old_DB = $DB['DB']; +// $old_DB = $DB['DB']; $old_DB_TYPE = $DB['TYPE']; $old_DB_SERVER = $DB['SERVER']; $old_DB_PORT = $DB['PORT']; @@ -734,7 +734,7 @@ /* restore connection */ global $DB; - $DB['DB'] = $old_DB; +// $DB['DB'] = $old_DB; $DB['TYPE'] = $old_DB_TYPE; $DB['SERVER'] = $old_DB_SERVER; $DB['PORT'] = $old_DB_PORT; -- cgit