Merge tag 'v1.6.1' into fiksgatami-dev

1 files changed, 8 insertions, 12 deletions

diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index c02618725..58ae96bc2 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -150,19 +150,15 @@ sub _populate_service_request_params {
         $params->{deviceid} = $problem->service;
     }
 
-    if ( $problem->extra ) {
-        my $extras = $problem->extra;
-
-        for my $attr ( @$extras ) {
-            my $attr_name = $attr->{name};
-            if ( $attr_name eq 'first_name' || $attr_name eq 'last_name' ) {
-                $params->{$attr_name} = $attr->{value} if $attr->{value};
-                next if $attr_name eq 'first_name';
-            }
-            $attr_name =~ s/fms_extra_//;
-            my $name = sprintf( 'attribute[%s]', $attr_name );
-            $params->{ $name } = $attr->{value};
+    for my $attr ( @{$problem->get_extra_fields} ) {
+        my $attr_name = $attr->{name};
+        if ( $attr_name eq 'first_name' || $attr_name eq 'last_name' ) {
+            $params->{$attr_name} = $attr->{value} if $attr->{value};
+            next if $attr_name eq 'first_name';
         }
+        $attr_name =~ s/fms_extra_//;
+        my $name = sprintf( 'attribute[%s]', $attr_name );
+        $params->{ $name } = $attr->{value};
     }
 
     return $params;