tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Removed junk from CVS, unnecessary newlines etc

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41462 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Matt Peel 2007-09-08 03:18:26 +00:00
parent 0bf12a22d1
commit aaabe7ee94
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/control/ContentController.php
View File

@ -1,7 +1,4 @@
<?php <?php
/** /**
* The most common kind if controller; effectively a controller linked to a {@link DataObject}. * 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 // '&' in a URL is apparently naughty
$action = preg_replace('/&/', '&amp;', $action); $action = preg_replace('/&/', '&amp;', $action);
return $this->URLSegment . "/$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); 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";
} }
//----------------------------------------------------------------------------------// //----------------------------------------------------------------------------------//