Fix for ticket #953.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9014 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 7, 2008 · bfcbf26 · bfcbf26
1 parent 864fd7a
commit bfcbf26
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp
@@ -105,8 +105,12 @@ QString QgsAttributeAction::expandAction(QString action, const std::vector<std::
 
   for (unsigned int i = 0; i < values.size(); ++i)
     {
-      QString to_replace = "%" + values[i].first;
-      expanded_action = expanded_action.replace(to_replace, values[i].second);
+      // Check for a replace a quoted version and a non-quoted version.
+      QString to_replace_1 = "[%" + values[i].first + "]";
+      QString to_replace_2 = "%" + values[i].first;
+
+      expanded_action = expanded_action.replace(to_replace_1, values[i].second);
+      expanded_action = expanded_action.replace(to_replace_2, values[i].second);
     }
 
   return expanded_action;