diff --git a/lib/classes/output/class.linker.php b/lib/classes/output/class.linker.php
index 8ba42484..b19b1c56 100644
--- a/lib/classes/output/class.linker.php
+++ b/lib/classes/output/class.linker.php
@@ -150,7 +150,7 @@ class linker
 			# For all but the first argument, prepend "&"
 			if (substr($link, -1) != "?")
 			{
-				$link .= "&";
+				$link .= "&";
 			}
 
 			# Encode parameters and add them to the link
diff --git a/lib/functions/output/function.redirectTo.php b/lib/functions/output/function.redirectTo.php
index 3dd35e52..ec318522 100644
--- a/lib/functions/output/function.redirectTo.php
+++ b/lib/functions/output/function.redirectTo.php
@@ -38,21 +38,28 @@
 
 function redirectTo($destination, $get_variables = array(), $isRelative = false)
 {
-	$params = array();
+	global $s;
 
 	if(is_array($get_variables))
 	{
-		foreach($get_variables as $key => $value)
+		if (isset($get_variables['s']))
 		{
-			$params[] = urlencode($key) . '=' . urlencode($value);
+			$linker = new linker($destination, $get_variables['s']);
+		}
+		else
+		{
+			$linker = new linker($destination, $s);
 		}
 
-		$params = '?' . implode($params, '&');
+		foreach($get_variables as $key => $value)
+		{
+			$linker->add($key, $value);
+		}
 
 		if($isRelative)
 		{
-			$protocol = '';
-			$host = '';
+			$linker->protocol = '';
+			$linker->host = '';
 			$path = './';
 		}
 		else
@@ -60,14 +67,14 @@ function redirectTo($destination, $get_variables = array(), $isRelative = false)
 			if(isset($_SERVER['HTTPS'])
 			   && strtolower($_SERVER['HTTPS']) == 'on')
 			{
-				$protocol = 'https://';
+				$linker->protocol = 'https';
 			}
 			else
 			{
-				$protocol = 'http://';
+				$linker->protocol = 'http';
 			}
 
-			$host = $_SERVER['HTTP_HOST'];
+			$linker->host = $_SERVER['HTTP_HOST'];
 
 			if(dirname($_SERVER['PHP_SELF']) == '/')
 			{
@@ -77,14 +84,15 @@ function redirectTo($destination, $get_variables = array(), $isRelative = false)
 			{
 				$path = dirname($_SERVER['PHP_SELF']) . '/';
 			}
+			$linker->filename = $path . $destination;
 		}
-
-		header('Location: ' . $protocol . $host . $path . $destination . $params);
+		header('Location: ' . $linker->getLink());
 		exit;
 	}
 	elseif($get_variables == null)
 	{
-		header('Location: ' . $destination);
+		$linker = new linker($destination, $s);
+		header('Location: ' . $linker->getLink());
 		exit;
 	}