r3507 renderIPv4SpaceEditor(): make IPv4 network tree build unconditional
authorDenis Ovsienko <infrastation@yandex.ru>
Sun, 2 May 2010 17:15:12 +0000 (17:15 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Sun, 2 May 2010 17:15:12 +0000 (17:15 +0000)
ChangeLog
inc/interface.php

index aff22b6..a42bc4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
        bugfix: PHP warning with certain auth setups (#310)
        bugfix: don't add AC-in port for switches, which don't have it (#316)
        bugfix: accept MAC addresses returned by newer Catalysts
+       bugfix: IPv4 management page was sometimes broken (#309)
 0.17.9 2010-02-17
        new feature: added per-user UI options (ticket:29)
        new feature: LDAP cache can be disabled now (ticket:247)
index 0c20c7d..01969e6 100644 (file)
@@ -2213,13 +2213,10 @@ function renderIPv4SpaceEditor ()
                startPortlet ('Manage existing (' . count ($addrspaceList) . ')');
                echo "<table class='widetable' border=0 cellpadding=5 cellspacing=0 align='center'>\n";
                echo "<tr><th>&nbsp;</th><th>prefix</th><th>name</th><th>capacity</th></tr>";
-               if (getConfigVar ('IPV4_JAYWALK') != 'yes')
-               {
-                       array_walk ($addrspaceList, 'amplifyCell');
-                       $tree = prepareIPv4Tree ($addrspaceList, 'ALL');
-                       // this is only called for having "trace" set
-                       treeFromList ($addrspaceList);
-               }
+               array_walk ($addrspaceList, 'amplifyCell');
+               $tree = prepareIPv4Tree ($addrspaceList, 'ALL');
+               // this is only called for having "trace" set
+               treeFromList ($addrspaceList);
                foreach ($addrspaceList as $netinfo)
                {
                        $netinfo = peekNode ($tree, $netinfo['trace'], $netinfo['id']);