|
@@ -93,7 +93,7 @@ discard block |
|
|
block discarded – undo |
|
93
|
93
|
$related = $this->getRelation('deviceCountRelation')->first(); |
|
94
|
94
|
|
|
95
|
95
|
// then return the count directly |
|
96
|
|
- return ($related) ? (int)$related->count : 0; |
|
|
96
|
+ return ($related) ? (int) $related->count : 0; |
|
97
|
97
|
} |
|
98
|
98
|
|
|
99
|
99
|
/** |
|
@@ -176,7 +176,7 @@ discard block |
|
|
block discarded – undo |
|
176
|
176
|
} |
|
177
|
177
|
|
|
178
|
178
|
foreach (Settings::get('alert.macros.group', []) as $macro => $value) { |
|
179
|
|
- $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex |
|
|
179
|
+ $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex |
|
180
|
180
|
if (!str_contains($macro, ' ')) { |
|
181
|
181
|
$pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern); |
|
182
|
182
|
} |
Please login to merge, or discard this patch.