diff options
author | Steve Beaver <sbeaver@netgate.com> | 2018-11-21 08:51:46 -0500 |
---|---|---|
committer | jim-p <jimp@netgate.com> | 2018-12-11 09:45:23 -0500 |
commit | 3409b0f6d38eb13bd592c7ca5a680f7b5c82b19b (patch) | |
tree | 433aac76e3a6749dd99b972bd81964a4849db466 /src | |
parent | 04c647094c37474e902a94c5ee9dfb3ee87b04fd (diff) | |
download | pfsense-3409b0f6d38eb13bd592c7ca5a680f7b5c82b19b.zip pfsense-3409b0f6d38eb13bd592c7ca5a680f7b5c82b19b.tar.gz |
Minor fixes related to #9121
(cherry picked from commit 6f9729c0a53be67ced6d52e6e33dba6b237083ab)
Diffstat (limited to 'src')
-rwxr-xr-x | src/etc/rc.filter_synchronize | 2 | ||||
-rw-r--r-- | src/usr/local/www/services_dnsmasq_domainoverride_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_admin.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index 1b1b896..774026e 100755 --- a/src/etc/rc.filter_synchronize +++ b/src/etc/rc.filter_synchronize @@ -354,7 +354,7 @@ if (is_array($config['hasync'])) { $sections[] = 'voucher'; } - if (count($sections) <= 0) { + if (is_array($sections) && count($sections) <= 0) { log_error("Nothing has been configured to be synched. Skipping...."); return; } diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 630567b..dc28368 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -66,7 +66,7 @@ if ($_POST['save']) { return (substr($haystack, 0, strlen($needle)) == $needle); } - if (String_Begins_With(_msdcs, $_POST['domain'])) { + if (String_Begins_With('_msdcs', $_POST['domain'])) { $subdomainstr = substr($_POST['domain'], 7); if ($subdomainstr && !is_domain($subdomainstr)) { diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index cf2284e..1ecbef4 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -660,7 +660,7 @@ while ($counter < $numaddrs) { $section->addInput(new Form_Button( 'addrow', - 'Add whitelist', + 'Add address', null, 'fa-plus' ))->addClass('btn-success addbtn'); |