change attribute action notation from [%attr%]/%attr% back to [%attr]…

…/%attr git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14341 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 5, 2010 · 2320cc8 · 2320cc8
1 parent ba27ce7
commit 2320cc8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp
@@ -114,9 +114,9 @@ QString QgsAttributeAction::expandAction( QString action, const QgsAttributeMap
 
     // Check for a replace a quoted version and a non-quoted version.
     QString to_replace_1 = "[%" + fit->name() + "]";
-    QString to_replace_2 = "%" + fit->name() + "%";
-    QString to_replace_3 = "%" + mLayer->attributeDisplayName( it.key() ) + "%";
-    QString to_replace_4 = "[%" + mLayer->attributeDisplayName( it.key() ) + "%]";
+    QString to_replace_2 = "%" + fit->name();
+    QString to_replace_3 = "%" + mLayer->attributeDisplayName( it.key() );
+    QString to_replace_4 = "[%" + mLayer->attributeDisplayName( it.key() ) + "]";
 
     expanded_action = expanded_action.replace( to_replace_1, it.value().toString() );
     expanded_action = expanded_action.replace( to_replace_2, it.value().toString() );