summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/setup.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-07 10:40:10 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-07 10:40:10 +0000
commit1f6bef28b8801d8f902ab23c520dfcf7430b1394 (patch)
treed0c5db994a5d7f890be156edbdb0a0634513729b /frontends/php/include/setup.inc.php
parentdc18c3c54aa5bd3d198b6ab480b6d42c4731df18 (diff)
- [DEV-137] minor fix to setup (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5681 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/setup.inc.php')
-rw-r--r--frontends/php/include/setup.inc.php10
1 files changed, 5 insertions, 5 deletions
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;