patch.diff

Index: webpagetest/runtest.php
===================================================================
--- webpagetest/runtest.php  (revision 1932)
+++ webpagetest/runtest.php	(working copy)
@@ -917,9 +917,13 @@
             else
             {                
                 // see if we need to pick the default connectivity
-                if( (!isset($locations[$test['location']]['connectivity']) || !strlen($locations[$test['location']]['connectivity'])) && !isset($test['connectivity']) )
+                if( (!isset($locations[$test['location']]['connectivity']) || !strlen($locations[$test['location']]['connectivity'])) && !isset($test['connectivity']) ) {
                     $test['connectivity'] = 'Cable';
+                } elseif (isset($locations[$test['location']]['connectivity'])) {
+                    $test['connectivity'] = $locations[$test['location']]['connectivity'];
+                }
                     
                 if( isset($test['browser']) && strlen($test['browser']) )
                     $test['locationText'] .= " - <b>{$test['browser']}</b>";
                 if( isset($test['connectivity']) )

Something more like this:

if( (!array_key_exists('connectivity', $locations[$test['location']]) ||
     !strlen($locations[$test['location']]['connectivity'])) &&
     !isset($test['connectivity'])) {
  if (array_key_exists('default connectivity', $locations[$test['location']]) &&
      strlen($locations[$test['location']]['default connectivity']))
    $test['connectivity'] = $locations[$test['location']]['default connectivity'];
  else
    $test['connectivity'] = 'Cable';
}