fix c40a764

jef-n · jef-n · commit 84e4539b9e80 · 2015-11-19T16:07:23.000+01:00
diff --git a/src/server/qgsaccesscontrol.cpp b/src/server/qgsaccesscontrol.cpp
@@ -31,7 +31,7 @@ void QgsAccessControl::filterFeatures( const QgsVectorLayer* layer, QgsFeatureRe
   for ( acIterator = mPluginsAccessControls->constBegin(); acIterator != mPluginsAccessControls->constEnd(); ++acIterator )
   {
     const QString expression = acIterator.value()->layerFilterExpression( layer );
-    if ( expression )
+    if ( !expression.isEmpty() )
     {
       expressions.append( expression );
     }
@@ -56,7 +56,7 @@ const QString QgsAccessControl::extraSubsetString( const QgsVectorLayer* layer )
   for ( acIterator = mPluginsAccessControls->constBegin(); acIterator != mPluginsAccessControls->constEnd(); ++acIterator )
   {
     const QString sql = acIterator.value()->layerFilterSubsetString( layer );
-    if ( sql )
+    if ( !sql.isEmpty() )
     {
       sqls.append( sql );
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void QgsAccessControl::filterFeatures( const QgsVectorLayer* layer, QgsFeatureRe`
`31`	`31`	`for ( acIterator = mPluginsAccessControls->constBegin(); acIterator != mPluginsAccessControls->constEnd(); ++acIterator )`
`32`	`32`	`{`
`33`	`33`	`const QString expression = acIterator.value()->layerFilterExpression( layer );`
`34`		`- if ( expression )`
	`34`	`+ if ( !expression.isEmpty() )`
`35`	`35`	`{`
`36`	`36`	`expressions.append( expression );`
`37`	`37`	`}`
`@@ -56,7 +56,7 @@ const QString QgsAccessControl::extraSubsetString( const QgsVectorLayer* layer )`
`56`	`56`	`for ( acIterator = mPluginsAccessControls->constBegin(); acIterator != mPluginsAccessControls->constEnd(); ++acIterator )`
`57`	`57`	`{`
`58`	`58`	`const QString sql = acIterator.value()->layerFilterSubsetString( layer );`
`59`		`- if ( sql )`
	`59`	`+ if ( !sql.isEmpty() )`
`60`	`60`	`{`
`61`	`61`	`sqls.append( sql );`
`62`	`62`	`}`