1 files changed, 16 insertions, 2 deletions
diff --git a/src/ste/STEStandardLibrary.php b/src/ste/STEStandardLibrary.php
index 915b699..68ba06a 100644
--- a/src/ste/STEStandardLibrary.php
+++ b/src/ste/STEStandardLibrary.php
@@ -12,13 +12,27 @@ class STEStandardLibrary {
 	}
 	
 	static public function escape($ste, $params, $sub) {
+		$content = $ste->eval_sub_with_escaping($sub, STECore::ESCAPE_NONE);
+		
 		if($ste->evalbool(@$params["lines"])) {
-			return nl2br(htmlspecialchars(str_replace("\r\n", "\n", $sub($ste))));
+			return nl2br(htmlspecialchars(str_replace("\r\n", "\n", $content)));
 		} else {
-			return htmlspecialchars($sub($ste));
+			return htmlspecialchars($content);
 		}
 	}
 	
+	static public function raw($ste, $params, $sub) {
+		return $ste->eval_sub_with_escaping($sub, STECore::ESCAPE_NONE);
+	}
+	
+	static public function autoescape($ste, $params, $sub) {
+		if(empty($params["mode"])) {
+			throw new RuntimeError("Missing mode parameter in <ste:arraylen>.");
+		}
+		
+		return $content = $ste->eval_sub_with_escaping($sub, $params['mode']);
+	}
+	
 	static public function strlen($ste, $params, $sub) {
 		return strlen($sub($ste));
 	}