From a2215d1c79001d5fd163feadc42a10d8bbb81815 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 2 Jan 2015 16:01:29 +0100
Subject: [PATCH] Removed old debug code

---
 .../files/lib/page/AbstractPage.class.php        | 16 ----------------
 .../lib/system/request/LinkHandler.class.php     | 10 ++--------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/wcfsetup/install/files/lib/page/AbstractPage.class.php b/wcfsetup/install/files/lib/page/AbstractPage.class.php
index 828f05a6be..93e81b76d3 100644
--- a/wcfsetup/install/files/lib/page/AbstractPage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractPage.class.php
@@ -186,13 +186,6 @@ abstract class AbstractPage implements IPage, ITrackablePage {
 			
 			// use $_SERVER['REQUEST_URI'] because it represents the URL used to access the site and not the internally rewritten one
 			$requestURI = preg_replace('~[?&]s=[a-f0-9]{40}~', '', $_SERVER['REQUEST_URI']);
-			if (strpos($requestURI, '%') !== false) {
-				// DEBUG ONLY
-				if ($_SERVER['REMOTE_ADDR'] != '5.28.86.103') {
-					$requestURI = urldecode($requestURI);
-				}
-				// /DEBUG ONLY
-			}
 			if (!StringUtil::isUTF8($requestURI)) {
 				$requestURI = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $requestURI);
 			}
@@ -221,15 +214,6 @@ abstract class AbstractPage implements IPage, ITrackablePage {
 			}
 			
 			if ($redirect) {
-				if ($_SERVER['REMOTE_ADDR'] == '5.28.86.103') {
-					header('Content-Type: text/html; charset=utf-8');
-					echo "<pre>";
-					echo "<h3>Redirect</h3>";
-					echo "Canonical: " . $this->canonicalURL . "\n";
-					echo "RequestURL: " . $requestURI . "\n";
-					exit;
-				}
-				
 				$redirectURL = $this->canonicalURL;
 				if (!empty($requestURL['query'])) {
 					$queryString = $requestURL['query'];
diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
index ef033d4b8b..1db4ae1429 100644
--- a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
@@ -66,8 +66,8 @@ class LinkHandler extends SingletonFactory {
 		$abbreviation = 'wcf';
 		$anchor = '';
 		$isACP = $originIsACP = RequestHandler::getInstance()->isACPRequest();
-		$encodeTitle = $forceWCF = $isRaw = false;
-		$appendSession = true;
+		$forceWCF = $isRaw = false;
+		$appendSession = $encodeTitle = true;
 		
 		// enforce a certain level of sanitation and protection for links embedded in emails
 		if (isset($parameters['isEmail']) && (bool)$parameters['isEmail']) {
@@ -110,12 +110,6 @@ class LinkHandler extends SingletonFactory {
 			unset($parameters['forceWCF']);
 		}
 		
-		// DEBUG ONLY
-		if ($_SERVER['REMOTE_ADDR'] == '5.28.86.103') {
-			$parameters['encodeTitle'] = true;
-		}
-		// /DEBUG ONLY
-		
 		if (isset($parameters['encodeTitle'])) {
 			$encodeTitle = $parameters['encodeTitle'];
 			unset($parameters['encodeTitle']);
-- 
2.20.1