Index: branches/5.2.x/core/kernel/globals.php
===================================================================
diff -u -N -r16000 -r16027
--- branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 16000)
+++ branches/5.2.x/core/kernel/globals.php	(.../globals.php)	(revision 16027)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 16000 2013-11-05 08:58:29Z alex $
+* @version	$Id: globals.php 16027 2014-04-29 13:00:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -901,6 +901,64 @@
 		throw new InvalidArgumentException(sprintf('Unknown escape strategy "%s"', $strategy));
 	}
 
+	/**
+	 * Unescapes a string.
+	 *
+	 * @param string $text     Text to unescape.
+	 * @param string $strategy Escape strategy.
+	 *
+	 * @return string
+	 * @throws InvalidArgumentException When unknown escape strategy is given.
+	 */
+	public static function unescape($text, $strategy = null)
+	{
+		if ( !isset($strategy) ) {
+			$strategy = self::$escapeStrategy;
+		}
+
+		if ( strpos($strategy, '+') !== false ) {
+			$previous_strategy = '';
+			$strategies = explode('+', $strategy);
+
+			foreach ($strategies as $current_strategy) {
+				// apply default strategy
+				if ( $current_strategy == '' ) {
+					$current_strategy = self::$escapeStrategy;
+				}
+
+				// don't double-unescape
+				if ( $current_strategy != $previous_strategy ) {
+					$text = self::unescape($text, $current_strategy);
+					$previous_strategy = $current_strategy;
+				}
+			}
+
+			return $text;
+		}
+
+		if ( $strategy == self::ESCAPE_HTML ) {
+			return htmlspecialchars_decode($text, ENT_QUOTES);
+		}
+
+		if ( $strategy == self::ESCAPE_JS ) {
+			// TODO: consider using "stripcslashes", because "stripslashes" isn't really for JavaScript unescaping (according to docs)
+			$text = str_replace("</'+'script>", '</script>', $text);
+			$text = str_replace(array('\r', '\n'), array("\r", "\n"), $text);
+			$text = stripslashes($text);
+
+			return $text;
+		}
+
+		if ( $strategy == self::ESCAPE_URL ) {
+			return rawurldecode($text);
+		}
+
+		if ( $strategy == self::ESCAPE_RAW ) {
+			return $text;
+		}
+
+		throw new InvalidArgumentException(sprintf('Unknown escape strategy "%s"', $strategy));
+	}
 }
 
 /**
@@ -1046,4 +1104,4 @@
 
 		return $res;
 	}
-}
\ No newline at end of file
+}