Created by command: /usr/bin/tito tag --use-version 3.4.10 --use-release 0.beta1%{?dist}tags/zabbix-3.4.10-0.beta1^0 zabbix-3.4.10-0.beta1
parent
80de86d333
commit
742795fa27
4 changed files with 8 additions and 36 deletions
@ -1 +1 @@ |
|||||||
3.4.9-3.beta0 ./ |
3.4.10-0.beta1 ./ |
||||||
|
@ -0,0 +1 @@ |
|||||||
|
.git/annex/objects/2z/GK/SHA256E-s17300622--cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b.tar.gz/SHA256E-s17300622--cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b.tar.gz |
@ -1,30 +0,0 @@ |
|||||||
diff -Nur -x '*.orig' -x '*.rej' zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php mezzanine_patched_zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php
|
|
||||||
--- zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php 2018-05-09 11:57:42.000000000 +0200
|
|
||||||
+++ mezzanine_patched_zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php 2018-05-29 11:25:39.130154434 +0200
|
|
||||||
@@ -1630,7 +1630,7 @@
|
|
||||||
$master_itemids = [];
|
|
||||||
|
|
||||||
foreach ($items as $item) {
|
|
||||||
- if ($item['type'] == ITEM_TYPE_DEPENDENT) {
|
|
||||||
+ if ($item['type'] == ITEM_TYPE_DEPENDENT && array_key_exists('master_itemid', $item)) {
|
|
||||||
$master_itemids[$item['master_itemid']] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1645,7 +1645,7 @@
|
|
||||||
$host_master_items = [];
|
|
||||||
|
|
||||||
foreach ($items as $item) {
|
|
||||||
- if ($item['type'] != ITEM_TYPE_DEPENDENT) {
|
|
||||||
+ if ($item['type'] == ITEM_TYPE_DEPENDENT && array_key_exists('master_itemid', $item)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$master_item = $master_items[$item['master_itemid']];
|
|
||||||
@@ -1653,7 +1653,7 @@
|
|
||||||
if (!array_key_exists($item['hostid'], $host_master_items)) {
|
|
||||||
$host_master_items[$item['hostid']] = [];
|
|
||||||
}
|
|
||||||
- if ($master_item['hostid'] != $item['hostid']) {
|
|
||||||
+ if (bccomp($master_item['hostid'], $item['hostid']) != 0) {
|
|
||||||
if (!array_key_exists($master_item['key_'], $host_master_items[$item['hostid']])) {
|
|
||||||
$inherited_master_items = DB::select('items', [
|
|
||||||
'output' => ['itemid'],
|
|
Loading…
Reference in new issue