diff --git a/NEWS b/NEWS
index 5aa1c21a..6551e6b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
-    - added security features for third party template editing (Monte,Andrei)
-    - added assign custom function, documented (Monte)
+    - fixed a bug with passing quoted arguments to modifiers inside {if}
+      statements. (Andrei, Sam Beckwith)
+    - added security features for third party template editing. (Monte, Andrei)
+    - added assign custom function, documented. (Monte)
     - fixed a problem with putting $ followed by numbers inside {strip} and
       {/strip} tags. (Andrei)
     - fixed Config_File class to allow empty config paths (defaults to current
diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php
index 6e89bbf9..0c0e854f 100644
--- a/Smarty_Compiler.class.php
+++ b/Smarty_Compiler.class.php
@@ -476,7 +476,7 @@ class Smarty_Compiler extends Smarty {
                          "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         | # match all double quoted strings allowed escaped double quotes
                          \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'     | # match all single quoted strings allowed escaped single quotes
                          [()]                                   | # match parentheses
-                         [^"\'\s()]+                              # match any other token that is not any of the above
+                         [^\s()]+                                 # match any other token that is not any of the above
                         )/x', $tag_args, $match);
         $tokens = $match[0];
 
diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php
index 6e89bbf9..0c0e854f 100644
--- a/libs/Smarty_Compiler.class.php
+++ b/libs/Smarty_Compiler.class.php
@@ -476,7 +476,7 @@ class Smarty_Compiler extends Smarty {
                          "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         | # match all double quoted strings allowed escaped double quotes
                          \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'     | # match all single quoted strings allowed escaped single quotes
                          [()]                                   | # match parentheses
-                         [^"\'\s()]+                              # match any other token that is not any of the above
+                         [^\s()]+                                 # match any other token that is not any of the above
                         )/x', $tag_args, $match);
         $tokens = $match[0];