Added safeNl2br() string helper, doesn't nl2br text inside <..>

components/com_fabrik/helpers/string.php

@@ -1062,6 +1062,24 @@ public static function getRowClass($value, $prefix)
 	}
 
 
+	/**
+	 * Apply nl2br only outside of chevroned tags, eq. not between <...>
+	 *
+	 * @param $string
+	 *
+	 * @return mixed
+	 */
+	public static function safeNl2br($string)
+	{
+		return preg_replace_callback(
+			'#(\r\n?|\n)(?![^<]*>|[^<>]*</)#s',
+			function ($matches) {
+				return nl2br($matches[0]);
+			},
+			$string
+		);
+	}
+
 }
 
 /**
@@ -1121,6 +1139,4 @@ public static function _($string, $jsSafe = false, $interpretBackSlashes = true,
 		// if we got this far, hand it to JText::_() as normal
 		return parent::_($string, $jsSafe, $interpretBackSlashes, $script);
 	}
-
-
 }

plugins/fabrik_element/textarea/textarea.php

@@ -128,7 +128,7 @@ public function renderListData($data, stdClass &$thisRow, $opts = array())
 				{
 					for ($i = 0; $i < count($data); $i++)
 					{
-						$data[$i] = nl2br($data[$i]);
+						$data[$i] = FabrikString::safeNl2br($data[$i]);
 					}
 				}
 				else
@@ -138,7 +138,7 @@ public function renderListData($data, stdClass &$thisRow, $opts = array())
 						$this->convertDataToString($data);
 					}
 
-					$data = nl2br($data);
+					$data = FabrikString::safeNl2br($data);
 				}
 			}
 
@@ -281,7 +281,7 @@ public function render($data, $repeatCounter = 0)
 			{
 				if (!$this->useWysiwyg(false))
 				{
-					$value = nl2br($value);
+					$value = FabrikString::safeNl2br($value);
 				}
 
 				if ($value !== ''