diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-02-04 11:54:15 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-02-04 11:54:15 +0000 |
| commit | b3b985954885406328914bbe7a43b70e0021785b (patch) | |
| tree | fc6bfc8057b308d95fc46049c273f34cd007a687 /frontends/php/include/classes | |
| parent | 86aca2d4d765227fee2701f1df1e562065927f2b (diff) | |
| download | zabbix-b3b985954885406328914bbe7a43b70e0021785b.tar.gz zabbix-b3b985954885406328914bbe7a43b70e0021785b.tar.xz zabbix-b3b985954885406328914bbe7a43b70e0021785b.zip | |
- [ZBX-291] Problem in Hosts group editing
[svn merge svn://svn.zabbix.com/branches/1.4 -r5311:5313]
git-svn-id: svn://svn.zabbix.com/trunk@5314 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/classes')
| -rw-r--r-- | frontends/php/include/classes/ccombobox.inc.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php index e0a7775c..a3c54f0b 100644 --- a/frontends/php/include/classes/ccombobox.inc.php +++ b/frontends/php/include/classes/ccombobox.inc.php @@ -87,8 +87,14 @@ // if($enabled=='no') return; /* disable item method 1 */ if(is_null($selected)){ $selected = 'no'; - if((strcmp($value,$this->value) == 0) || (is_array($this->value) && str_in_array($value, $this->value))) + if(is_array($this->value)) { + if(str_in_array($value,$this->value)) + $selected = 'yes'; + } + else if(strcmp($value,$this->value) == 0) + { $selected = 'yes'; + } } parent::AddItem(new CComboItem($value,$caption,$selected,$enabled)); @@ -183,8 +189,14 @@ { if(is_null($selected)) { - if((strcmp($value,$this->value) == 0) || (is_array($this->value) && str_in_array($value, $this->value))) + if(is_array($this->value)) { + if(str_in_array($value,$this->value)) + $this->value_exist = 1; + } + else if(strcmp($value,$this->value) == 0) + { $this->value_exist = 1; + } } parent::AddItem($value,$caption,$selected,$enabled); |