diff -r all/modules/contrib/location/handlers/location_handler_field_location_country.inc default/modules/location/handlers/location_handler_field_location_country.inc
9c9
< class location_handler_field_location_country extends views_handler_field_prerender_list {
---
> class location_handler_field_location_country extends views_handler_field {
14d13
< 
28,58c27
<   /**
<     * Process the values that are currently being passed to us
<     * since the (nid) is the unique value we will use that as our
<     * index and group the results based on that
<     */
<   function pre_render($values) {
<     $this->items = array();
<     foreach ($values as $value) {
<       $field = $value->{$this->field_alias};
<       $index = $value->nid;
<       $this->items[$index][$field] = array('item' => $field);
<     }
<  }
< 
<   /**
<     * Grab the appropriate items based on the $value (object)'s nid (which in our case)
<     * is our index
<     */
<   function get_items($values) {
<     $index = $values->nid;
<     if (!empty($this->items[$index])) {
<       return $this->items[$index];
<     }
<     return array();
<   }
< 
<   /**
<     * Figure out based on the user settings how to render each item
<     * NOTE: This is only for rendering the output
<     */
<   function render_item($count, $item) {
---
>   function render($values) {
60c29
<       return check_plain(location_country_name($item['item']));
---
>       return check_plain(location_country_name($values->{$this->field_alias}));
63c32
<       return check_plain(strtoupper($item['item']));
---
>       return check_plain(strtoupper($values->{$this->field_alias}));
66d34
< 
diff -r all/modules/contrib/location/location.views.inc default/modules/location/location.views.inc
37c37
<         'parent' => 'views_handler_field_prerender_list',
---
>         'parent' => 'views_handler_field',