802.1Q recalc wasn't make switch out-of-sync

recalc8021QPorts: wrong object id to touch

diff --git a/ChangeLog b/ChangeLog
index 97b94957d85249c9cb682be6a5f009f607be98bb..210a978c38cb1fd7ecea4fa0b3ef73618c7290d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
        bugfix: references to tags and files remained when a location was deleted
                (#747)
        bugfix: date/time attributes handling code had a bug (#719)
+       bugfix: 802.1Q recalc button wasn't turning switch in out-of-sync state
        update: vlan search results now include binded IP networks
        update: make scaled rack thumb images sharp again
        update: Cisco IOS 15.0 support

diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index 9ae7011e218bf492d8f28a6082ed24eb0f9701d5..fb2a8078a83b86037473502e96cbfa325da82c64 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -4446,7 +4446,7 @@ function recalc8021QPorts ($switch_id)
        // queue changes in D-config of local switch
        if ($changed = replace8021QPorts ('desired', $switch_id, $before, $order))
        {
-               touchVLANSwitch ($portinfo['remote_object_id']);
+               touchVLANSwitch ($switch_id);
                $ret['switches'] ++;
                $ret['ports'] += $changed;
        }