summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/config.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-02 09:49:44 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-02 09:49:44 +0000
commit053e091380bdeff1d9a423e1dfdcfcda396045d5 (patch)
treeda06e467138936e3cd12ee6db4c73e677c305a76 /frontends/php/include/config.inc.php
parent467c2281b799cf57a72682097fbeb7caa7d1faae (diff)
downloadzabbix-053e091380bdeff1d9a423e1dfdcfcda396045d5.tar.gz
zabbix-053e091380bdeff1d9a423e1dfdcfcda396045d5.tar.xz
zabbix-053e091380bdeff1d9a423e1dfdcfcda396045d5.zip
- [ZBX-134] merged rev. 4956:4966 of branches/1.4/ (Artem) (fixes for hostid/groupid validation on Node switch)
git-svn-id: svn://svn.zabbix.com/trunk@4968 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
-rw-r--r--frontends/php/include/config.inc.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2e54580f..24cec730 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -254,9 +254,8 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!!
global $ZBX_CURRENT_NODEID, $ZBX_CURRENT_SUBNODES, $ZBX_WITH_SUBNODES;
if ( !isset($ZBX_CURRENT_NODEID) ) init_nodes();
-
$result = ( is_show_subnodes($forse_with_subnodes) ? $ZBX_CURRENT_SUBNODES : $ZBX_CURRENT_NODEID );
-
+
if ( !is_null($perm) )
{
global $USER_DETAILS;