From ff724b44de07e5720ddae9fc1f9d6eb83341d299 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 8 Feb 2010 02:16:29 +0000 Subject: [PATCH] MINOR Documentation git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98372 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Controller.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/control/Controller.php b/core/control/Controller.php index 837df1774..4dfe75429 100755 --- a/core/control/Controller.php +++ b/core/control/Controller.php @@ -535,10 +535,15 @@ class Controller extends RequestHandler { } /** - * Joins two link segments together, putting a slash between them if necessary. - * Use this for building the results of Link() methods. - * - * If either of the links have query strings, then they will be combined and put at the end of the resulting url. + * Joins two or more link segments together, putting a slash between them if necessary. + * Use this for building the results of {@link Link()} methods. + * If either of the links have query strings, + * then they will be combined and put at the end of the resulting url. + * + * Caution: All parameters are expected to be URI-encoded already. + * + * @param String + * @return String */ static function join_links() { $args = func_get_args();