set provider request attribute supset only if requested, fixes 7112 a…

…nd 7267
qgis · Jul 6, 2013 · 0f578a4 · 0f578a4
1 parent 4538cf1
commit 0f578a4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -256,7 +256,11 @@ void QgsVectorLayerFeatureIterator::useChangedAttributeFeature( QgsFeatureId fid
     QgsFeature tmp;
     //mDataProvider->featureAtId( fid, tmp, false, mFetchProvAttributes );
     QgsFeatureRequest request;
-    request.setFilterFid( fid ).setFlags( QgsFeatureRequest::NoGeometry ).setSubsetOfAttributes( mProviderRequest.subsetOfAttributes() );
+    request.setFilterFid( fid ).setFlags( QgsFeatureRequest::NoGeometry );
+    if ( subsetAttrs )
+    {
+      request.setSubsetOfAttributes( mProviderRequest.subsetOfAttributes() );
+    }
     QgsFeatureIterator fi = L->dataProvider()->getFeatures( request );
     if ( fi.nextFeature( tmp ) )
     {