From aaabe7ee94d328a0a8dfcb6b21e4d9360e403fa9 Mon Sep 17 00:00:00 2001
From: Matt Peel <signups@madman.net.nz>
Date: Sat, 8 Sep 2007 03:18:26 +0000
Subject: [PATCH] Removed junk from CVS, unnecessary newlines etc

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41462 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/control/ContentController.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/control/ContentController.php b/core/control/ContentController.php
index bc09a6346..937695801 100644
--- a/core/control/ContentController.php
+++ b/core/control/ContentController.php
@@ -1,7 +1,4 @@
 <?php
-
-
-
 /**
  * The most common kind if controller; effectively a controller linked to a {@link DataObject}.
  *
@@ -41,16 +38,9 @@ class ContentController extends Controller {
 			// '&' in a URL is apparently naughty
 			$action = preg_replace('/&/', '&amp;', $action);
 			return $this->URLSegment . "/$action";
-		}else{
+		} else {
 			user_error("ContentController::RelativeLink() No URLSegment given on a '$this->class' object.  Perhaps you should overload it?", E_USER_WARNING);
 		}
-		/** TODO : junk from CVS ?? **/
-		//if($action == "index") $action = "";
-		
-		// '&' in a URL is apparently naughty
-		// $action = preg_replace('/&/', '&amp;', $action);
-		
-		//return $this->URLSegment . "/$action";
 	}
 	
 	//----------------------------------------------------------------------------------//