Index: modules/location/handlers/location_views_handler_filter_proximity.inc
===================================================================
--- modules/location/handlers/location_views_handler_filter_proximity.inc	(revision 8)
+++ modules/location/handlers/location_views_handler_filter_proximity.inc	(working copy)
@@ -161,6 +161,7 @@ class location_views_handler_filter_prox
 
   // Used from the distance field.
   function calculate_coords() {
+	global $user;
     if (!empty($this->value['latitude']) && !empty($this->value['longitude'])) {
       // If there are already coordinates, there's no work for us.
       return TRUE;
@@ -190,15 +191,21 @@ class location_views_handler_filter_prox
       }
     }
 
+
     if ($this->value['get_origin_from_url']) {
-      if (arg(0) == 'node' && is_numeric(arg(1)) && $node = node_load(arg(1))) {
-        $this->value['latitude'] = $node->location['latitude'];
-        $this->value['longitude'] = $node->location['longitude'];
-      }
-      elseif (arg(0) == 'user' && is_numeric(arg(1)) && $user = user_load(arg(1))) {
+      #if (arg(0) == 'node' && is_numeric(arg(1)) && $node = node_load(arg(1))) {
+      #  $this->value['latitude'] = $node->location['latitude'];
+      #  $this->value['longitude'] = $node->location['longitude'];
+      #}
+      #elseif (arg(0) == 'user' && is_numeric(arg(1)) && $user = user_load(arg(1))) {
         // @todo get user location
-	echo "boo";
-      }
+	//echo "boo";
+	$user_location = location_load_locations($user->uid, 'uid');
+	$user_location = $user_location[0];
+    	$this->value['latitude'] = $user_location['latitude'];
+    	$this->value['longitude'] = $user_location['longitude'];
+    return true;
+      #}
     }
 
     if (empty($this->value['latitude']) || empty($this->value['longitude'])) {
@@ -211,7 +218,6 @@ class location_views_handler_filter_prox
     if (empty($this->value)) {
       return;
     }
-
     // Coordinates available?
     if (!$this->calculate_coords()) {
       // Distance set?
@@ -227,7 +233,6 @@ class location_views_handler_filter_prox
 
     $lat = $this->value['latitude'];
     $lon = $this->value['longitude'];
-
     $distance_meters = _location_convert_distance_to_meters($this->value['search_distance'], $this->value['search_units']);
 
     $latrange = earth_latitude_range($lon, $lat, $distance_meters);