From 04bbb3a588bcab2cebb159f635d85836b0dbaea5 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 11 Mar 2015 14:59:42 -0300 Subject: [PATCH] Revert "Use a consistent variable name here. related to Ticket #4446" This reverts commit 309162b96d6ad0db09c132cc0aabc890bfe1909f. --- usr/local/www/xmlrpc.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 13e98ff787..ec6d458d36 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");