summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/services.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-13 08:22:32 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-13 08:22:32 +0000
commitabaab90a1c9d3367f1ef636557cfe8e661716749 (patch)
tree3e266e5523a635c45a7e7ef6d4571e7323f26065 /frontends/php/include/services.inc.php
parent8901654871973b4267f106a97183001189189c82 (diff)
downloadzabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.gz
zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.xz
zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.zip
- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]
git-svn-id: svn://svn.zabbix.com/trunk@4549 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/services.inc.php')
-rw-r--r--frontends/php/include/services.inc.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 9399eeb8..1f474cdd 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -107,15 +107,13 @@
}
function add_host_to_services($hostid, $serviceid){
- global $ZBX_CURNODEID;
-
$result = DBselect('SELECT distinct h.host,t.triggerid,t.description '.
' FROM triggers t,hosts h,items i,functions f '.
' WHERE h.hostid='.$hostid.
' AND h.hostid=i.hostid '.
' AND i.itemid=f.itemid '.
' AND f.triggerid=t.triggerid '.
- ' AND '.DBid2nodeid('t.triggerid').'='.$ZBX_CURNODEID
+ ' AND '.DBin_node('t.triggerid', get_current_nodeid(false))
);
while($row=DBfetch($result)){