From 264ca54e406eee7c01b01f748aabd4a29e9c4872 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Sun, 26 Jun 2016 10:33:27 +0200 Subject: simplify DHCP_Config_Option_Split, no loop needed for returning option array --- src/etc/inc/interfaces.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/etc') diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 7816298..c97bd72 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -4364,12 +4364,8 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif) { } function DHCP_Config_Option_Split($option_string) { - $options = []; - preg_match_all('/[^",]*(?:"[^"]*"[^",]*)+(?:"[^",]*)?|[^,]+/m', $option_string, $result, PREG_PATTERN_ORDER); - for ($i = 0; $i < count($result[0]); $i++) { - $options[] = $result[0][$i]; - } - return $options; + preg_match_all('/[^",]*(?:"[^"]*"[^",]*)+(?:"[^",]*)?|[^,]+/m', $option_string, $matches, PREG_PATTERN_ORDER); + return $matches ? $matches[0] : []; } function DHCP_Config_File_Override($wancfg, $wanif) { -- cgit v1.1