diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 14:59:42 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 16:02:47 -0300 |
| commit | 04bbb3a588bcab2cebb159f635d85836b0dbaea5 (patch) | |
| tree | 0ab7c02eac70ee26ee3ecaead843380808108391 /usr/local/www/xmlrpc.php | |
| parent | 24dadbee0608731ce19713d905bedbf588518821 (diff) | |
| download | pfsense-04bbb3a588bcab2cebb159f635d85836b0dbaea5.zip pfsense-04bbb3a588bcab2cebb159f635d85836b0dbaea5.tar.gz | |
Revert "Use a consistent variable name here. related to Ticket #4446"
This reverts commit 309162b96d6ad0db09c132cc0aabc890bfe1909f.
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 13e98ff..ec6d458 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -279,12 +279,8 @@ function restore_config_section_xmlrpc($raw_params) { } } /* Cleanup remaining old carps */ - foreach ($oldvips as $oldvipif => $oldvipar) { - if (strstr($oldvipar['interface'], '_vip')) { - $oldvipif = explode('_vip', $oldvipar['interface']); - $oldvipif = $oldvipif[0]; - } else - $oldvipif = get_real_interface($oldvipar['interface']); + foreach ($oldvips as $oldvipif => $oldvippar) { + $oldvipif = get_real_interface($oldvippar['interface']); if (!empty($oldvipif)) { if (is_ipaddrv6($oldvipif)) mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete"); |
