summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-08-29 08:08:00 +0545
committerPhil Davis <phil.davis@inf.org>2015-08-29 08:08:00 +0545
commit68d6d0b8c027705b66d38caa3218abb979f70623 (patch)
treee221c9c0b0d509e81e68948e81d026cfd2f21163
parent206154295194d88942f419dd4c8d2c824963cf1c (diff)
downloadpfsense-68d6d0b8c027705b66d38caa3218abb979f70623.zip
pfsense-68d6d0b8c027705b66d38caa3218abb979f70623.tar.gz
Handle multiple notices in the same second RELENG_2_2
Backport of https://github.com/pfsense/pfsense/pull/1823
-rw-r--r--etc/inc/notices.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc
index 91d3800..7dc2834 100644
--- a/etc/inc/notices.inc
+++ b/etc/inc/notices.inc
@@ -80,6 +80,9 @@ function file_notice($id, $notice, $category = "General", $url = "", $priority =
'category' => $category,
'priority' => $priority,
);
+ while (isset($queue[$queuekey])) {
+ $queuekey++;
+ }
$queue[$queuekey] = $toqueue;
$queueout = fopen($notice_path, "w");
if(!$queueout) {
OpenPOWER on IntegriCloud