lib/scrivito/content_conversion.rb in scrivito_sdk-0.40.0.rc1 vs lib/scrivito/content_conversion.rb in scrivito_sdk-0.40.0.rc2

@@ -31,17 +31,22 @@
         convert_link(link_data, request_host, request_port)
       end
     end
 
     def self.convert_link(link_data, request_host, request_port)
-      if link_data && link_data.has_key?(:url)
+      return unless link_data
+
+      if url = link_data.delete(:url)
         link_data.delete(:obj_id)
-        url = link_data.delete(:url)
         link = Link.parse(url, request_host, request_port)
         link_data.merge!(link.to_cms_api_linklist_params)
       end
 
-      link_data
+      if obj_id = link_data.delete(:obj_id)
+        link_data.merge!(obj: Obj.find(obj_id))
+      end
+
+      Link.new(link_data)
     end
   end
 
 end