From b291345848dca71701782d4df12e6b59e8179a9c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sat, 23 Dec 2017 15:11:00 +0100
Subject: [PATCH] Firewall, rule parsing. move suffix to parameters for
 parsePlainCurly() , also for https://github.com/opnsense/core/issues/1326

---
 src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
index 9d71ddd53..3b00a1c50 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
@@ -94,15 +94,15 @@ abstract class Rule
      * parse plain data
      * @param string $value field value
      * @param string $prefix prefix when $value is provided
+     * @param string $suffix suffix when $value is provided
      * @return string
      */
-    protected function parsePlainCurly($value, $prefix = "")
+    protected function parsePlainCurly($value, $prefix = "", $suffix = "")
     {
-        $suffix = "";
         if (strpos($value, '$') === false) {
             // don't wrap aliases in curly brackets
             $prefix = $prefix . "{";
-            $suffix = "}";
+            $suffix = "}" . $suffix;
         }
         return $value == null || $value === '' ? '' : $prefix . $value . $suffix . ' ';
     }