Merge pull request #1026 from anitagraser/working

attempt to fix http://hub.qgis.org/issues/9184
qgis · Dec 15, 2013 · bb1380e · bb1380e
2 parents 27bea19 + d132451
commit bb1380e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/python/plugins/processing/algs/JoinAttributes.py b/python/plugins/processing/algs/JoinAttributes.py
@@ -75,9 +75,7 @@ def processAlgorithm(self, progress):
         joinField2Index = layer2.fieldNameIndex(field2)
 
         # Output
-        outFields = []
-        outFields.extend(provider.fields())
-        outFields.extend(provider2.fields())
+        outFields = vector.combineVectorFields(layer,layer2) 
 
         writer = output.getVectorWriter(outFields, provider.geometryType(),
                 layer.crs())
@@ -98,12 +96,10 @@ def processAlgorithm(self, progress):
                 attrs2 = inFeat2.attributes()
                 joinValue2 = attrs2[joinField2Index]
                 if joinValue1 == joinValue2:
-
                     # Create the new feature
                     outFeat.setGeometry(inGeom)
                     attrs.extend(attrs2)
                     break
             outFeat.setAttributes(attrs)
             writer.addFeature(outFeat)
-
         del writer