diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-15 15:31:00 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-15 15:31:00 -0400 |
| commit | 3df8786bfd712c2d553b690f75680f1a12129a60 (patch) | |
| tree | 609082a929128f41d895fe2ef50aed783bc5c00e /etc/inc | |
| parent | d56f17d1ccf9d0150c9c178be60620b64b0ffa1a (diff) | |
| parent | 62905808cbdf86088a637da92f7cb2946e28d527 (diff) | |
| download | pfsense-3df8786bfd712c2d553b690f75680f1a12129a60.zip pfsense-3df8786bfd712c2d553b690f75680f1a12129a60.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index cd419ff..e54413c 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1241,8 +1241,12 @@ function captiveportal_write_db($cpdb, $locked = false, $remove = false) { if (is_array($remove)) { if (!empty($remove)) { $cpdb = captiveportal_read_db(true); - foreach ($remove as $key) - unset($cpdb[$key]); + foreach ($remove as $key) { + if (is_array($key)) + log_error("Captive portal Array passed as unset index: " . print_r($key, true)); + else + unset($cpdb[$key]); + } } else return; //This makes sure no record removal calls } |
