[QGIS Commit] r14341 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-05 13:01:36 +0000 (Tue, 05 Oct 2010)
New Revision: 14341

Modified:
   trunk/qgis/src/core/qgsattributeaction.cpp
Log:
change attribute action notation from [%attr%]/%attr% back to [%attr]/%attr

Modified: trunk/qgis/src/core/qgsattributeaction.cpp
===================================================================
--- trunk/qgis/src/core/qgsattributeaction.cpp	2010-10-05 12:39:48 UTC (rev 14340)
+++ trunk/qgis/src/core/qgsattributeaction.cpp	2010-10-05 13:01:36 UTC (rev 14341)
@@ -114,9 +114,9 @@
 
     // 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() );