Merge branch 'master' into stable

1 files changed, 4 insertions, 2 deletions

diff --git a/data.php b/data.php
index 005267c..938c865 100644
--- a/data.php
+++ b/data.php
@@ -326,8 +326,10 @@ foreach ($lines as $num => $line)
                 if($locations[$locids[$iptoLoc]]->state == "offline")
       $locations[$locids[$iptoLoc]]->state = "online";
     }
-    if (($nodename[$ipfromLoc] == "tunnel" && $locations[$locids[$ipfromLoc]]->locname=="housing") ||
-      ($nodename[$iptoLoc] == "tunnel" && $locations[$locids[$iptoLoc]]->locname=="housing" ) ||
+    if (($nodename[$ipfromLoc] == "tunnel" && $locations[$locids[$ipfromLoc]]->locname == "housing") ||
+      ($nodename[$iptoLoc] == "tunnel" && $locations[$locids[$iptoLoc]]->locname == "housing") ||
+      ($nodename[$ipfromLoc] == "viennagw" && $locations[$locids[$ipfromLoc]]->locname == "edis") ||
+      ($nodename[$iptoLoc] == "viennagw" && $locations[$locids[$iptoLoc]]->locname == "edis") ||
       ($locations[$locids[$iptoLoc]]->hastinc && $locations[$locids[$ipfromLoc]]->hastinc)) {
       $links[$i]->label = -1;